Merge branch 'master' into feature/issue_coin

api/controllers/TickerController.php

@@ -14,7 +14,7 @@ use common\service\exchange\ExchangeBuilderFactory;
 
 class TickerController extends BaseController
 {
-    protected $basic_coin = ['ETH', 'BTC', 'USDT', 'BTY'];
+    protected $basic_coin = ['ETH', 'BTC', 'USDT', 'BTY', 'CNYT'];
     protected $basic_price = [];
 
     public function actionIndex()
@@ -76,6 +76,7 @@ class TickerController extends BaseController
                 "btc,btc",
                 "usdt,ethereum",
                 "bty,bty",
+                "cnyt,bitnasdaqchain"
             ]
         ];
         $params = json_encode($data);
@@ -103,7 +104,7 @@ class TickerController extends BaseController
                 $msg = '参数错误';
                 goto doEnd;
             }
-            $model = CoinOptional::find()->where(['device_code' => $device_code, 'symbol' => $symbol, 'platform_id' => (int)$platform_id])->one();
+            $model = CoinOptional::find()->where(['device_code' => $device_code, 'symbol' => $symbol, 'platform' => $platform, 'platform_id' => (int)$platform_id])->one();
             if ($model) {
                 $msg = '数据已存在!';
                 goto doEnd;
@@ -164,13 +165,16 @@ class TickerController extends BaseController
                     $exchange = 'Binance';
                 } else if ('zhaobi' == $val['platform']) {
                     $exchange = 'Zhaobi';
+                } else if ('bitnasdaq' == strtolower($val['platform'])) {
+                    $exchange = 'Bitnasdaq';
                 } else {
+
                 }
 
                 $symbol = explode('/', $val['symbol']);
                 $tag_first = $currency = $symbol[0];
                 $tag_second = $symbol[1];
-                if ('BCH' == strtoupper($tag_first)){
+                if ('BCH' == strtoupper($tag_first)) {
                     $tag_first = 'BCC';
                 }
                 $exchange = ExchangeFactory::createExchange($exchange);
@@ -201,6 +205,10 @@ class TickerController extends BaseController
                     $temp['platform_zh'] = '币安';
                     $temp['platform_us'] = 'binance';
                 }
+                if ('BITNASDAQ' == strtoupper($val['platform'])) {
+                    $temp['platform_zh'] = '比特纳斯达克';
+                    $temp['platform_us'] = 'bitnasdaq';
+                }
                 array_push($ticker, $temp);
             }
             if (!empty($condition)) {

common/models/psources/CoinBannerItem.php

@@ -5,6 +5,7 @@
  * Date: 2018/12/18
  * Time: 16:56
  */
+
 namespace common\models\psources;
 
 use common\core\BaseActiveRecord;
@@ -30,8 +31,9 @@ class CoinBannerItem extends BaseActiveRecord
     {
         return [
             [['image_url', 'platform_id'], 'required'],
+            ['banner_url', 'default', 'value' => '#'],
             [['banner_url', 'title'], 'safe'],
-            [['banner_url', 'image_url'], 'url']
+            [['image_url'], 'url']
         ];
     }
 
@@ -57,6 +59,6 @@ class CoinBannerItem extends BaseActiveRecord
 
     public function getPlatform()
     {
-        return $this->hasOne(CoinPlatform::className(), ['id'=>'platform_id']);
+        return $this->hasOne(CoinPlatform::className(), ['id' => 'platform_id']);
     }
 }
\ No newline at end of file

common/service/exchange/factory/BitnasdaqBuilder.php

@@ -34,7 +34,7 @@ class BitnasdaqBuilder extends FactoryService
         $keys = $this->redis->smembers($this->supported_symbol);
         if (false == $this->redis->exists($this->supported_symbol_list)) {
             foreach ($keys as $val) {
-                if (in_array(strtoupper($val), ['BNCUSDT','BTCUSDT','CNYTUSDT','ETCUSDT','ETHUSDT','GHPUSDT','LTCUSDT'])) {
+                if (in_array(strtoupper($val), ['BNCUSDT', 'BTCUSDT', 'CNYTUSDT', 'ETCUSDT', 'ETHUSDT', 'GHPUSDT', 'LTCUSDT', 'BTCCNYT', 'ETCCNYT', 'ETHCNYT', 'GHPCNYT', 'LTCCNYT'])) {
                     $this->redis->lpush($this->supported_symbol_list, strtoupper($val));
                 }
             }
@@ -73,8 +73,8 @@ class BitnasdaqBuilder extends FactoryService
                     $temp['symbol'] = strtoupper($explode_arr[0]) . '/' . $coin;
                     $temp['currency'] = strtoupper($explode_arr[0]);
                     $temp['base_currency'] = strtoupper($coin);
-                    $temp['close'] = rtrim(sprintf('%.8f', floatval($close)),'0');
-                    $temp['close_usd'] = rtrim(sprintf('%.6f', floatval($close * $this->basic_price[$coin]['usd'])),'0');
+                    $temp['close'] = rtrim(sprintf('%.8f', floatval($close)), '0');
+                    $temp['close_usd'] = rtrim(sprintf('%.6f', floatval($close * $this->basic_price[$coin]['usd'])), '0');
                     $temp['close_rmb'] = (float)sprintf("%0.4f", $close * $this->basic_price[$coin]['rmb']);
                     $temp['change'] = (false == $open) ? 0 : (float)sprintf("%0.2f", ($close - $open) / $open * 100);
                     $temp['high_usd'] = (float)sprintf("%0.4f", $high * $this->basic_price[$coin]['usd']);

common/service/exchange/factory/FactoryService.php

@@ -13,7 +13,7 @@ use linslin\yii2\curl\Curl;
 abstract class FactoryService
 {
     protected $code = -1;
-    protected $basic_coin = ['ETH', 'BTC', 'USDT', 'BTY'];
+    protected $basic_coin = ['ETH', 'BTC', 'USDT', 'BTY', 'CNYT'];
 
     protected $basic_price = [];
     protected $redis;
@@ -30,7 +30,8 @@ abstract class FactoryService
                 "eth,ethereum",
                 "btc,btc",
                 "usdt,ethereum",
-                "bty,bty"
+                "bty,bty",
+                "cnyt,bitnasdaqchain"
             ]
         ];
         $params = json_encode($data);

common/service/exchange/factory/ZhaobiBuilder.php

@@ -108,13 +108,15 @@ class ZhaobiBuilder extends FactoryService
                 if (2 == count($explode_arr) && empty($explode_arr[1])) {
                     $temp['close_rmb'] = (float)sprintf("%0.4f", $close * $this->basic_price[$coin]['rmb']);
                 }
+                if ('SFTCNY' == strtoupper($symbol)) {
+                    $temp['close_rmb'] = (float)sprintf("%0.4f", $close * 1);
+                }
             }
             $temp['change'] = (0 == $open) ? 0 : (float)sprintf("%0.2f", ($close - $open) / $open * 100);
             array_push($ticker, $temp);
             $key = $this->quotation_prefix . strtoupper($symbol);
             $this->redis_ticker->hmset($key, 'low', $low, 'high', $high, 'last', $close, 'open', $open, 'vol', $vol);
         }
-
         $ticker_sort_close = Tools::arraySort($ticker, 'close_rmb');
         $this->redis_ticker->del($this->supported_symbol_close_asc);
         $this->redis_ticker->del($this->supported_symbol_close_desc);