Merge branch 'feature/explore' into develop

api/controllers/ExploreController.php

@@ -91,9 +91,13 @@ class ExploreController extends BaseController
             $data = null;
             goto doEnd;
         }
+
         $id_arr = explode(',', $ids);
+        $order = "FIELD(`id`,$ids)";
         $apps_model = ExploreApp::find()->select('id, name, icon, type, app_url, slogan')
             ->where(['in', 'id', $id_arr])
+            ->orderBy([$order => true])
+            ->limit(4)
             ->all();
         foreach ($apps_model as &$app) {
             $app->name = $app->name[$this->lang];

common/service/exchange/factory/HuobiBuilder.php

@@ -86,7 +86,7 @@ class HuobiBuilder extends FactoryService
         $ticker = [];
         foreach ($keys as $val) {
             foreach ($this->basic_coin as $k => $coin) {
-                $explode_arr = explode(strtoupper($coin), $val);
+                $explode_arr = explode(strtoupper($coin), strtoupper($val));
                 if (2 == count($explode_arr) && empty($explode_arr[1])) {
                     if (false != $condition) {
                         list($low, $high, $close, $open, $vol) = $this->redis_ticker->hmget($this->quotation_prefix . strtoupper($val), 'low', 'high', 'last', 'open', 'vol');