Merge branch 'feature/optimize' into develop

console/controllers/IssueChainTransferController.php

@@ -378,6 +378,7 @@ class IssueChainTransferController extends Controller
             $model->platform = $params['platform'];
             $model->publish_count = $params['total'] * 1e4;
             $model->chain = 'BTY';
+            $model->platform_id = $params['platform_id'];
             $model->treaty = 1;
             $model->save();
         } else {

h5/controllers/CoinController.php

@@ -71,12 +71,6 @@ class CoinController extends BaseController
         }
         $fields = ['id', 'sid', 'icon', 'name', 'nickname', 'platform', 'chain', 'address as contract_address', 'introduce'];
         $result = ExchangeBusiness::getApiListForIndex(1, 999, $condition, $fields);
-        foreach ($result['data'] as $key => &$val) {
-            $nickname = json_decode($val['nickname'], true);
-            $val['nickname'] = isset($nickname[$this->lang]) ? $nickname[$this->lang] : '';
-            $introduce = json_decode($val['introduce'], true);
-            $val['introduce'] = isset($introduce[$this->lang]) ? $introduce[$this->lang] : '';
-        }
         if ($result) {
             $response_->build(ResponseBuild::STATUS_SUCCEED, '', $result['data']);
         } else {

wallet/controllers/FlashController.php

@@ -130,23 +130,23 @@ class FlashController extends BaseController
         $code = 0;
         $data = null;
         $group = Yii::$app->request->getGroup();
-        $platform_id = Yii::$app->request->post('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])) {
-            $msg = '此钱包节点尚未开通';
-            $code = -1;
-            goto doEnd;
-        }
-        $node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
-
         $result = Yii::$app->request->post();
         $time = time();
         if (Yii::$app->request->isPost) {
+            $platform_id = Yii::$app->request->post('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])) {
+                $msg = '此钱包节点尚未开通';
+                $code = -1;
+                goto doEnd;
+            }
+            $node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
+
             $params = [
                 'type' => $result['type'] ?? '',
                 'from' => $result['from'] ?? '',
@@ -183,6 +183,20 @@ class FlashController extends BaseController
         }
 
         if (Yii::$app->request->isPut) {
+            $platform_id = Yii::$app->request->post('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])) {
+                $msg = '此钱包节点尚未开通';
+                $code = -1;
+                goto doEnd;
+            }
+            $node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
+
             $params = [
                 'id' => $result['id'] ?? '',
                 'from' => $result['from'] ?? '',
@@ -219,8 +233,22 @@ class FlashController extends BaseController
         }
 
         if (Yii::$app->request->isDelete) {
+            $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])) {
+                $msg = '此钱包节点尚未开通';
+                $code = -1;
+                goto doEnd;
+            }
+            $node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
+
             $params = [
-                'id' => Yii::$app->request->post('id', '')
+                'id' => Yii::$app->request->get('id', '')
             ];
             $time = time();
             $appKey = isset($node_params['appKey']) ? $node_params['appKey'] : null;