Merge branch 'feature/optimize' into develop

api/controllers/CoinController.php

@@ -128,8 +128,9 @@ class CoinController extends BaseController
         $limit = $request->post('limit', 999);
         $platform_id = $request->post('platform_id', 1);//默认币钱包
         $recommend = $request->post('recommend', '');
+        $type = $request->post('type', 1);
         $chain = $request->post('chain', '');
-        $condition = ['platform_id' => $platform_id, 'type' => 1];
+        $condition = ['platform_id' => $platform_id, 'type' => $type];
         if ($recommend) {
             $condition['recommend'] = $recommend;
         }

api/controllers/RecommendCoinController.php

@@ -32,7 +32,7 @@ class RecommendCoinController extends BaseController
             $name = json_decode($category['name'], true);
             $category['name'] = isset($name[$this->lang]) ? $name[$this->lang] : '';
 
-            $recommend_coin = WalletRecommendCoin::find()->where(['category_id' => $category['id']])->all();
+            $recommend_coin = WalletRecommendCoin::find()->where(['category_id' => $category['id']])->orderBy('sort')->all();
             $items = [];
             if (!empty($recommend_coin)) {
                 foreach ($recommend_coin as $coin) {

api/controllers/SecKillController.php

@@ -10,6 +10,9 @@ class SecKillController extends BaseController
 {
     public function actionIndex()
     {
+        echo hash(141414, 'The quick brown fox jumped over the lazy dog.');
+        exit;
+
         $num = $this->randomFloat(1, 3);
         $expire = 5;
         $nowTime = time();
@@ -32,7 +35,10 @@ class SecKillController extends BaseController
             goto doEnd;
         }
 
+        //$is_locked = $redis->set($lock_key, $expTime, 'ex', 5, 'nx');
+
         $is_locked = $redis->setnx($lock_key, $expTime);
+
         if (!$is_locked) {
             $this->msg = 'ahaaa, locked';
             $this->code = -1;