Merge branch 'feature/optimize' into develop

api/controllers/CoinController.php

@@ -273,17 +273,16 @@ class CoinController extends BaseController
 
     public function actionSearch()
     {
+        $count = 0;
         $params = Yii::$app->request->post();
         $chain = isset($params['chain']) ? $params['chain'] : '';
         $keyword = isset($params['keyword']) ? $params['keyword'] : '';
-        $platform = isset($params['platform']) ? $params['platform'] : '';
         $platform_id = isset($params['platform_id']) ? $params['platform_id'] : '';
 
         $page = empty($params['page']) ? 1 : $params['page'];
         $limit = empty($params['limit']) ? 10 : $params['limit'];
 
         if (false == $platform_id) {
-            $msg = '参数错误';
             $code = -1;
             $data = null;
             goto doEnd;
@@ -298,10 +297,6 @@ class CoinController extends BaseController
             $query->andWhere(['chain' => $chain]);
         }
 
-        if (false != $platform) {
-            $query->andWhere(['platform' => $platform]);
-        }
-
         if (false != $keyword) {
             $query->andWhere(['or', ['like', 'address', $keyword], ['like', 'name', $keyword]]);
         }

common/service/trusteeship/TrusteeShipService.php

@@ -113,6 +113,13 @@ class TrusteeShipService
         return $this->send("POST", $uri, $params);
     }
 
+    public function coinList($params = [])
+    {
+        $uri = '/backend/coin/coin-list';
+
+        return $this->send("GET", $uri, $params);
+    }
+
     public function getUserAsset($params = [])
     {
         $uri = 'backend/user/asset';

wallet/controllers/FlashController.php

@@ -301,4 +301,50 @@ class FlashController extends BaseController
 
         return ['code' => $code, 'msg' => $msg, 'data' => $data];
     }
+
+    function actionIndex()
+    {
+        $msg = 'success';
+        $code = 0;
+        $data = null;
+        $group = Yii::$app->request->getGroup();
+        $platform_id = Yii::$app->request->get('platform_id', 0);
+
+        if (User::AUTH_SUPER !== $group && $platform_id != Yii::$app->request->getPlatformId()) {
+            $msg = '暂无权限';
+            $code = -1;
+            goto doEnd;
+        }
+        if (!isset(Yii::$app->params['trusteeship']['node_' . $platform_id])) {
+            return ['code' => -1, 'data' => [], 'msg' => '此钱包节点尚未开通'];
+        }
+        $node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
+
+        $params = [];
+        $time = time();
+        $appKey = isset($node_params['appKey']) ? $node_params['appKey'] : null;
+        $appSecret = isset($node_params['appSecret']) ? $node_params['appSecret'] : null;
+        $signature = self::getSign($params, $appKey, $appSecret, $time);
+
+        $headers = [
+            'FZM-Wallet-Signature' => $signature,
+            'FZM-Wallet-Timestamp' => $time,
+            'FZM-Wallet-AppKey' => $appKey,
+            'FZM-Wallet-AppIp' => Yii::$app->request->userIP
+        ];
+
+        $service = new TrusteeShipService($node_params, $headers);
+        $result = $service->coinList($params);
+
+        if (200 !== $result['code']) {
+            $msg = $result['msg'];
+            $code = -1;
+            goto doEnd;
+        }
+        $data = $result['msg'];
+
+        doEnd :
+
+        return ['code' => $code, 'msg' => $msg, 'data' => $data];
+    }
 }
\ No newline at end of file