Merge branch 'feature/optimize' into 'master'

api/base/BaseController.php

@@ -78,16 +78,16 @@ class BaseController extends Controller
                 Yii::$app->request->setBodyParams($rawBodyParams);
             }
         }
-        if ('ticker' == $request_controller && 'hot-ticker' == $request_action) {
-            $realip = Tools::getUserIp();
-            $ip_list = file_get_contents('http://172.16.0.230:8080/wallet_interface_ip_limit.txt');
-            $ip_arr = explode("\n", $ip_list);
-            foreach ($ip_arr as $key => $ip) {
-                if ($ip == $realip) {
-                    return false;
-                }
-            }
-        }
+//        if ('ticker' == $request_controller && 'hot-ticker' == $request_action) {
+//            $realip = Tools::getUserIp();
+//            $ip_list = file_get_contents('http://172.16.0.230:8080/wallet_interface_ip_limit.txt');
+//            $ip_arr = explode("\n", $ip_list);
+//            foreach ($ip_arr as $key => $ip) {
+//                if ($ip == $realip) {
+//                    return false;
+//                }
+//            }
+//        }
 
         $this->start = microtime(true);
         return parent::beforeAction($action); // TODO: Change the autogenerated stub

api/controllers/WalletController.php

@@ -116,29 +116,28 @@ class WalletController extends BaseController
         $token = Yii::$app->request->get('address', '');
         $symbol = Yii::$app->request->get('symbol', '');
         if (empty($platform_id) || empty($token) || empty($symbol)) {
-            $msg = '参数不能为空';
-            $code = -1;
-            $data = null;
+            $this->msg = '参数不能为空';
+            $this->code = -1;
             goto doEnd;
         }
 
         $chain_model = CoinPlatform::find()->select('chain_id')->where(['id' => $platform_id])->andWhere(['<>', 'chain_id', 0])->one();
         if (empty($chain_model)) {
-            $msg = '此功能为付费功能，有兴趣请与销售联系';
-            $code = -1;
+            $this->msg = '此功能为付费功能，有兴趣请与销售联系';
+            $this->code = -1;
             goto doEnd;
         }
         $platform = CoinPlatformWithHold::find()->select('exer, platform')->where(['id' => $chain_model->chain_id])->one();
         if (empty($platform)) {
-            $msg = '此功能为付费功能，有兴趣请与销售联系';
-            $code = -1;
+            $this->msg = '此功能为付费功能，有兴趣请与销售联系';
+            $this->code = -1;
             goto doEnd;
         }
 
-        $node = Yii::$app->params['chain_nodes'][strtoupper($platform->platform)];
+        $node = Yii::$app->params['chain_nodes'][strtoupper($platform->platform)] ?? null;
         if (empty($node)) {
-            $msg = '此功能为付费功能，有兴趣请与销售联系';
-            $code = -1;
+            $this->msg = '此功能为付费功能，有兴趣请与销售联系';
+            $this->code = -1;
             goto doEnd;
         }
 
@@ -170,14 +169,13 @@ class WalletController extends BaseController
         }
 
         if (0 !== $result['code']) {
-            $msg = '当前发币人数过多，请客官稍后再试';
-            $code = -1;
-            $data = null;
+            $this->msg = '当前发币人数过多，请客官稍后再试';
+            $this->code = -1;
             goto doEnd;
         }
-        $data = $result['result'];
+        $this->data = $result['result'];
         doEnd :
-        return ['code' => $code, 'data' => $data, 'msg' => $msg];
+        return ['code' => $this->code, 'data' => $this->data, 'msg' => $this->msg];
     }
 
     public function actionTransfer()