Merge branch 'feature/issue_coin' into develop

api/controllers/CoinController.php

@@ -374,7 +374,7 @@ class CoinController extends BaseController
         $service = new Chain33Business();
         $result = $service->getProperFee();
         if (0 === $result['code']) {
-            $platform_with_hold['bty_fee'] = (float)sprintf("%0.4f", $result['result']['properFee'] / 1e8);
+            $platform_with_hold['bty_fee'] = (float)sprintf("%0.4f", $result['result']['properFee'] / 1e8) > 0.01 ? 0.01 : (float)sprintf("%0.4f", $result['result']['properFee'] / 1e8);
         } else {
             $platform_with_hold['bty_fee'] = (float)sprintf("%0.4f", Yii::$app->params['bty_fee']);
         }

api/controllers/CoinDogController.php

@@ -27,6 +27,7 @@ class CoinDogController extends BaseController
                 $val['id'] = $val['news_id'];
             }
             $val['share_url'] = $bishijie['Url'] . '/shendu_' . $val['id'];
+            $val['source'] = '币世界';
         }
         $data = [
             'list' => isset($article['list']) ? $article['list'] : [],
@@ -56,6 +57,7 @@ class CoinDogController extends BaseController
         $bishijie_service = new BishijieService($appid, $appSecret);
         $article = $bishijie_service->getArticleDetail($id);
         $article['share_url'] = $bishijie['Url'] . '/shendu_' . $id;
+        $article['source'] = '币世界';
         if (@$article['code']) {
             $msg = $article['message'];
             $code = -1;
@@ -113,6 +115,7 @@ class CoinDogController extends BaseController
             preg_match_all("/\【(.+?)\】/", $item['content'], $match);
             $item['title'] = $match[1][0];
             $item['content'] = str_replace('【' . $item['title'] . '】', '', $item['content']);
+            $item['source'] = '金色财经';
         }
         $code = 0;
         $msg = 'success';

backend/views/source/_form-article.php

@@ -45,7 +45,7 @@
                     <div class="layui-input-block">
                         <img src="<?= $model->image_url ?>" style="margin-top: 11px; max-width: 32px; max-height: 32px" id="icon1">
                     </div>
-                    <input type="hidden" name="image_url" value=""  lay-verify="required|image_url">
+                    <input type="hidden" name="image_url" value="">
                 </div>
                 <div class="layui-inline" style="margin-left: 50px;">
                     <button type="button" class="layui-btn" id="upload1" style="">

common/business/ExchangeBusiness.php

@@ -98,7 +98,7 @@ class ExchangeBusiness
             goto doEnd;
         }
 
-        if (strtoupper($tag) == 'STO' || strtoupper($tag) == 'GM' || strtoupper($tag) == 'BSTC' || strtoupper($tag) == 'RYH' || strtoupper($tag) == 'CNDT' || strtoupper($tag) == 'WL' || strtoupper($tag) == 'ETS' || strtoupper($tag) == 'LIMS' || strtoupper($tag) == 'AT' || strtoupper($tag) == 'BTJ') {
+        if (strtoupper($tag) == 'GST' || strtoupper($tag) == 'JNTK' || strtoupper($tag) == 'SPT' ||strtoupper($tag) == 'STO' || strtoupper($tag) == 'GM' || strtoupper($tag) == 'BSTC' || strtoupper($tag) == 'RYH' || strtoupper($tag) == 'CNDT' || strtoupper($tag) == 'WL' || strtoupper($tag) == 'ETS' || strtoupper($tag) == 'LIMS' || strtoupper($tag) == 'AT' || strtoupper($tag) == 'BTJ') {
             $quotation = [
                 'low' => 0,
                 'high' => 0,

common/service/exchange/factory/BinanceBuilder.php

@@ -85,9 +85,10 @@ class BinanceBuilder extends FactoryService
                     list($low, $high, $close, $open, $vol) = $this->redis->hmget($this->quotation_prefix . strtolower($val), 'low', 'high', 'last', 'open', 'vol');
                     $temp = [];
                     $temp['symbol'] = strtoupper($explode_arr[0]) . '/' . $coin;
+                    #if ('BCC/USDT' != $temp['symbol']) continue;
                     $temp['currency'] = strtoupper($explode_arr[0]);
                     $temp['base_currency'] = strtoupper($coin);
-                    $temp['close'] = number_format($close, 6, '.', '');
+                    $temp['close'] = $this->sctonum($close, 8);
                     $temp['close_usd'] = (float)sprintf("%0.6f", $close * $this->basic_price[$coin]['usd']);
                     $temp['close_rmb'] = (float)sprintf("%0.4f", $close * $this->basic_price[$coin]['rmb']);
                     $temp['change'] = (0 == $open) ? 0 : (float)sprintf("%0.2f", ($close - $open) / $open * 100);
@@ -146,4 +147,14 @@ class BinanceBuilder extends FactoryService
         array_multisort($keysValue, $sort, $array);
         return $array;
     }
+
+    protected function sctonum($num, $double = 5)
+    {
+        if (false !== strpos($num, "e")) {
+            $a = explode("e", strtolower($num));
+            return bcmul($a[0], bcpow(10, $a[1], $double), $double);
+        } else {
+            return number_format($num, 6, '.', '');
+        }
+    }
 }
\ No newline at end of file

common/service/exchange/factory/HuobiBuilder.php

@@ -33,8 +33,7 @@ class HuobiBuilder extends FactoryService
             $res = $curl->get($api, false);
             if (isset($res['status']) && 'ok' == $res['status']) {
                 $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->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);
             }
         }
@@ -71,7 +70,7 @@ vol']);
                     $temp['symbol'] = strtoupper($explode_arr[0]) . '/' . $coin;
                     $temp['currency'] = strtoupper($explode_arr[0]);
                     $temp['base_currency'] = strtoupper($coin);
-                    $temp['close'] = number_format($close, 6, '.', '');
+                    $temp['close'] = $this->sctonum($close, 8);
                     $temp['close_usd'] = (float)sprintf("%0.6f", $close * $this->basic_price[$coin]['usd']);
                     $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);
@@ -162,4 +161,14 @@ vol']);
         }
         return ['code' => $this->code, 'ticker' => $ticker];
     }
+
+    protected function sctonum($num, $double = 5)
+    {
+        if (false !== stripos($num, "e")) {
+            $a = explode("e", strtolower($num));
+            return bcmul($a[0], bcpow(10, $a[1], $double), $double);
+        } else {
+            return number_format($num, 6, '.', '');
+        }
+    }
 }

common/service/exchange/factory/ZhaobiBuilder.php

@@ -39,6 +39,7 @@ class ZhaobiBuilder extends FactoryService
                         $temp['currency'] = strtoupper($explode_arr[0]);
                         $temp['base_currency'] = strtoupper($coin);
                         $temp['close'] = number_format($val['last'], 6, '.', '');
+                        if ('0.000000' == $temp['close']) continue;
                         $temp['close_usd'] = (float)sprintf("%0.6f", $val['last'] * $this->basic_price[$coin]['usd']);
                         $temp['close_rmb'] = (float)sprintf("%0.4f", $val['last'] * $this->basic_price[$coin]['rmb']);
                         $temp['change'] = (0 == $val['open']) ? 0 : (float)sprintf("%0.2f", ($val['last'] - $val['open']) / $val['open'] * 100);
@@ -105,7 +106,8 @@ class ZhaobiBuilder extends FactoryService
                 $this->code = 0;
                 $res['data']['abstract'] = str_replace(' ', '', str_replace(' ', '', $res['data']['abstract']));
                 $res['data']['content'] = str_replace(' ', '', str_replace(' ', '', $res['data']['content']));
-                $res['data']['share_url'] = \Yii::$app->params['service']['ZhaobiService']['url']. '/help/notice/' . $params['id'];
+                $res['data']['source'] = '找币';
+                $res['data']['share_url'] = \Yii::$app->params['service']['ZhaobiService']['h5_url']. '/account/help/' . $params['id'];
                 return ['code' => $this->code, 'notice' => $res['data']];
             } else {
                 return ['code' => $this->code, 'notice' => $res['data'], 'msg' => $res['message']];

console/controllers/TickerController.php

@@ -28,5 +28,7 @@ class TickerController extends Controller
     {
         $ticker_builder = ExchangeBuilderFactory::create('Huobi');
         $ticker_builder->hotTickerUpdate();
+        echo date('Y-m-d H:i:s') .'更新成功' . PHP_EOL;
+        return 0;
     }
 }
\ No newline at end of file