Merge branch 'master' into develop

backend/controllers/OssController.php

@@ -28,7 +28,7 @@ class OssController extends BaseController
             return ['code' => 1, 'msg' => '上传失败'];
         }
         if (in_array($type, ['coin', 'banner', 'h5_banner', 'h5_icon', 'application', 'h5_application'])) {
-            $file_url = explode('http://bqbwallet.oss-cn-shanghai.aliyuncs.com', $result["info"]['url']);
+            $file_url = explode('http://bqbwallet.oss-cn-shanghai.aliyuncs.com/upload', $result["info"]['url']);
             $image_id = CoinImage::addOneRecord($file_url[1]);
         }
 

common/business/ApplicationBusiness.php

@@ -64,7 +64,11 @@ class ApplicationBusiness
         $image_Items = array_merge($icon_Items, $banner_Items);
         $icon_Infos = CoinImage::getItemsByIds($image_Items);
         unset($condition['enable']);
-        $cate_app_Infos = self::getCateAppInfo($limit = 5, $condition);
+        $limit = 5;
+        if (isset($condition['platform_id']) && 26 == $condition['platform_id']) {
+            $limit = 15;
+        }
+        $cate_app_Infos = self::getCateAppInfo($limit, $condition);
         foreach ($data as $value) {
             $cate_app_item['id'] = $value['id'];
             $cate_app_item['name'] = $value['name'];

common/business/ExchangeBusiness.php

@@ -27,7 +27,7 @@ class ExchangeBusiness
      */
     private static $exchanges = [
         0 => 'Bty',
-        #1 => 'HuoBi',
+        1 => 'HuoBi',
         2 => 'Hadax',
         3 => 'Bitfinex',
         4 => 'Bittrex',
@@ -36,12 +36,12 @@ class ExchangeBusiness
         7 => 'S',
         8 => 'Zg',
         9 => 'Go',
-        #10 => 'Zhaobi',
+        10 => 'Zhaobi',
         11 => 'Gdpro',
         12 => 'Ex',
         13 => 'Zt',
         14 => 'Tsc',
-        #15 => 'Binance',
+        15 => 'Binance',
         16 => 'Ceohk',
         17 => 'Biki',
         18 => 'Bilaxy',

common/service/exchange/factory/BinanceBuilder.php

@@ -124,7 +124,7 @@ class BinanceBuilder extends FactoryService
             $temp = [];
             $temp['symbol'] = strtoupper($symbol);
             $temp['close'] = number_format($close, 6, '.', '');
-            $temp['change'] = (0 == $open) ? 0 : (float)sprintf("%0.4f", ($close - $open) / $open * 100);
+            $temp['change'] = (0 == $open) ? 0 : (float)sprintf("%0.2f", ($close - $open) / $open * 100);
             array_push($ticker, $temp);
         }
         $ticker_sort_close= $this->arraySort($ticker,'close');

common/service/exchange/factory/HuobiBuilder.php

@@ -19,47 +19,31 @@ class HuobiBuilder extends FactoryService
     protected $supported_symbol_change_sort_list = 'supported_symbol_change_sort_huobi_list';
     protected $quotation_prefix = 'quotation_huobi_';
 
-    public function getTicker()
+    public function hotTickerUpdate()
     {
         $curl = new Curl();
-        $api = $this->base_url . '/market/tickers';
+
+        $symbols = [
+            'btcusdt',
+            'ethusdt',
+            'eosusdt'
+        ];
+        foreach ($symbols as $symbol) {
+            $api = $this->base_url . '/market/detail?symbol=' . $symbol;
             $res = $curl->get($api, false);
-        $ticker = [];
             if (isset($res['status']) && 'ok' == $res['status']) {
-            $this->code = 0;
-            foreach ($res['data'] as $val) {
-                foreach ($this->basic_coin as $k => $coin) {
-                    $explode_arr = explode(strtolower($coin), $val['symbol']);
-                    if (2 == count($explode_arr) && empty($explode_arr[1])) {
-                        $temp = [];
-                        $temp['symbol'] = strtoupper($explode_arr[0]) . '/' . $coin;
-                        $temp['currency'] = strtoupper($explode_arr[0]);
-                        $temp['base_currency'] = strtoupper($coin);
-                        $temp['close'] = number_format($val['close'], 6, '.', '');
-                        $temp['close_usd'] = (float)sprintf("%0.6f", $val['close'] * $this->basic_price[$coin]['usd']);
-                        $temp['close_rmb'] = (float)sprintf("%0.4f", $val['close'] * $this->basic_price[$coin]['rmb']);
-                        $temp['change'] = (false == $val['open']) ? 0 : (float)sprintf("%0.4f", ($val['close'] - $val['open']) / $val['open'] * 100);
-                        $temp['high_usd'] = (float)sprintf("%0.4f", $val['high'] * $this->basic_price[$coin]['usd']);
-                        $temp['low_usd'] = (float)sprintf("%0.4f", $val['low'] * $this->basic_price[$coin]['usd']);
-                        $temp['high_rmb'] = (float)sprintf("%0.4f", $val['high'] * $this->basic_price[$coin]['rmb']);
-                        $temp['low_rmb'] = (float)sprintf("%0.4f", $val['low'] * $this->basic_price[$coin]['rmb']);
-                        $temp['vol'] = (float)sprintf("%0.4f", $val['vol']);
-                        $temp['optional'] = false;
-                        $temp['platform_zh'] = '火币';
-                        $temp['platform_us'] = 'huobi';
-                        array_push($ticker, $temp);
-                        break;
+                $key = $this->quotation_prefix . $symbol;
+                $this->redis->hmset($key, 'low', $res['tick']['low'], 'high', $res['tick']['high'], 'last', $res['tick']['close'], 'open', $res['tick']['open'], 'vol', $res['tick']['
+vol']);
+                $this->redis->sadd($this->supported_symbol, $symbol);
             }
         }
     }
-        }
-        return ['code' => $this->code, 'ticker' => $ticker];
-    }
 
     public function getTickerFromCache($page = 1)
     {
         $size = 0;
-        for ($i = 0; $i < $page; $i ++) {
+        for ($i = 0; $i < $page; $i++) {
             $size += 50;
             $this->end = $size;
         }
@@ -113,6 +97,7 @@ class HuobiBuilder extends FactoryService
         ];
         return ['code' => $this->code, 'data' => $data];
     }
+
     public function TickerSort()
     {
         $len = $this->redis->llen($this->supported_symbol_list);
@@ -123,14 +108,14 @@ class HuobiBuilder extends FactoryService
             $temp = [];
             $temp['symbol'] = strtoupper($symbol);
             $temp['close'] = number_format($close, 6, '.', '');
-            $temp['change'] = (0 == $open) ? 0 : (float)sprintf("%0.4f", ($close - $open) / $open * 100);
+            $temp['change'] = (0 == $open) ? 0 : (float)sprintf("%0.2f", ($close - $open) / $open * 100);
             array_push($ticker, $temp);
         }
-        $ticker_sort_close= $this->arraySort($ticker,'close');
+        $ticker_sort_close = $this->arraySort($ticker, 'close');
         foreach ($ticker_sort_close as $val) {
             $this->redis->lpush($this->supported_symbol_close_sort_list, $val['symbol']);
         }
-        $ticker_change_close= $this->arraySort($ticker,'change');
+        $ticker_change_close = $this->arraySort($ticker, 'change');
         foreach ($ticker_change_close as $val) {
             $this->redis->lpush($this->supported_symbol_change_sort_list, $val['symbol']);
         }

common/service/exchange/factory/ZhaobiBuilder.php

@@ -82,7 +82,7 @@ class ZhaobiBuilder extends FactoryService
             $temp = [];
             $temp['symbol'] = strtoupper($symbol);
             $temp['close'] = number_format($close, 6, '.', '');
-            $temp['change'] = (0 == $open) ? 0 : (float)sprintf("%0.4f", ($close - $open) / $open * 100);
+            $temp['change'] = (0 == $open) ? 0 : (float)sprintf("%0.2f", ($close - $open) / $open * 100);
             array_push($ticker, $temp);
         }
         $ticker_sort_close= $this->arraySort($ticker,'close');

console/controllers/TickerUpdateController.php → console/controllers/TickerController.php

@@ -10,23 +10,8 @@ use common\service\exchange\ExchangeFactory;
 use yii\console\Controller;
 use Yii;
 
-class TickerUpdateController extends Controller
+class TickerController extends Controller
 {
-    /**
-     * 行情排序
-     */
-    public function actionIndex()
-    {
-        $class = ['Binance', 'HuoBi', 'Zhaobi'];
-        foreach ($class as $val) {
-            go(function () use ($val) {
-                \Co::sleep(0.5);
-                $exchange = ExchangeFactory::createExchange($val);
-                $exchange->setQuotation();
-            });
-        }
-    }
-
     public function actionSort()
     {
         $class = ['Binance', 'Huobi', 'Zhaobi'];
@@ -38,4 +23,10 @@ class TickerUpdateController extends Controller
             });
         }
     }
+
+    public function actionHot()
+    {
+        $ticker_builder = ExchangeBuilderFactory::create('Huobi');
+        $ticker_builder->hotTickerUpdate();
+    }
 }
\ No newline at end of file