Merge branch 'feature/optimize' into 'master'

common/business/ExchangeBusiness.php

@@ -284,6 +284,12 @@ class ExchangeBusiness
             goto doEnd;
         }
 
+        if (in_array(strtoupper($tag), ['BTY','YCC'])) {
+            $exchange = ExchangeFactory::createExchange("Superx");
+            $quotation = $exchange->getTicker($tag, 'USDT');
+            goto doEnd;
+        }
+
         if (in_array(strtoupper($tag), ['CIC', 'MC'])) {
             $exchange = ExchangeFactory::createExchange("Ztb");
             $quotation = $exchange->getTicker(strtoupper($tag), 'USDT');
@@ -442,7 +448,7 @@ class ExchangeBusiness
         $exchange = ExchangeFactory::createExchange("Rate");
         $rate = $exchange->getTicker("CNY", "USD");
         $cny_usd_rate = 1 / $rate['last'];
-        $quotation['rmb'] = (float)sprintf("%0.4f", $quotation['last'] / $cny_usd_rate);
+        $quotation['rmb'] = isset($quotation['rmb']) ? $quotation['rmb'] : (float)sprintf("%0.4f", $quotation['last'] / $cny_usd_rate);
         if (in_array(strtoupper($tag), ['FOLI', 'CIC', 'MC', 'KPC8', 'BBD', 'BVA', 'DAG', 'BNC', 'BNB', 'GHP', 'DRA', 'ETC', 'PAX', 'STH', 'XJH', 'SFT', 'TSC', 'SUM', 'USDW', 'FUT', 'MBTC', 'METH', 'GLCW', 'HDC', 'GWA', 'KLG', 'LELE', 'ZUE'])) {
             $quotation['usd'] = (float)sprintf("%0.4f", $quotation['last']);
             $quotation['low'] = (float)sprintf("%0.4f", $quotation['low']);

console/controllers/TickerController.php

@@ -63,7 +63,7 @@ class TickerController extends Controller
                     foreach ($div->find('td') as $key => $e) {
                         if ($key == 5) {
                             $key = 'quotation_boc_' . 'CNY_' . $val->currency->symbol;
-                            $currency = rtrim(sprintf('%.6f', 1 / ($e->innertext / 100)), '0');
+                            $currency = rtrim(sprintf('%.6f', 1 / (str_replace("
", "", $e->innertext) / 100)), '0');
                             Yii::$app->redis_currency->hmset($key, 'low', $currency, 'high', $currency, 'last', $currency, 'open', $currency);
                         }
                     }