Merge branch 'master' into feature/issue_coin

api/controllers/CoinController.php

@@ -260,6 +260,7 @@ class CoinController extends BaseController
                 $value['chain_quotation'] = $chain_quotation[$value['chain']] ?: null;
                 $value['chain_rmb'] = isset($value['chain_quotation']['rmb']) ? $value['chain_quotation']['rmb'] : 0;
                 $value['chain_usd'] = isset($value['chain_quotation']['usd']) ? $value['chain_quotation']['usd'] : 0;
+                #$value['chain_country_rate'] = (float)sprintf("%0.4f", $last[0] * $value['chain_rmb']);
                 $value['country_rate'] = (false == $currency) ? $value['chain_rmb'] : (float)sprintf("%0.4f", $last[0] * $value['rmb']);
             }
             return $result;

common/models/psources/ExploreApp.php

@@ -30,9 +30,10 @@ class ExploreApp extends BaseActiveRecord
     public function rules()
     {
         return [
-            [['name', 'icon', 'app_url', 'slogan', 'type', 'sort', 'status', 'platform_id', 'app_category_id'], 'required'],
+            [['name', 'icon', 'app_url', 'type', 'sort', 'status', 'platform_id', 'app_category_id'], 'required'],
             [['type', 'sort', 'status', 'platform_id', 'app_category_id'], 'integer'],
             ['slogan', 'string', 'max' => 50],
+            [['slogan'], 'safe'],
             [['icon'], 'url']
         ];
     }

common/service/exchange/factory/ZhaobiBuilder.php

@@ -108,7 +108,7 @@ 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)) {
+                if ('SFTCNY' == strtoupper($symbol) || 'BTYCCNY' == strtoupper($symbol) || 'USDTCCNY' == strtoupper($symbol)) {
                     $temp['close_rmb'] = (float)sprintf("%0.4f", $close * 1);
                 }
             }