节点变更

console/controllers/CrossChainController.php

@@ -92,20 +92,21 @@ class CrossChainController extends Controller
             return 0;
         }
 
-//        正式环境查询共识高度
-//        $node_params = [
-//            'scheme' => 'https',
-//            'host' => 'jiedian1.bityuan.com',
-//            'port' => 8801
-//        ];
-
-        //测试环境查询共识高度
-        //3步交易情况下需要做高度判断，2步交易注释IF判断
+        //正式环境查询共识高度
+        //3步交易情况下需要做高度判断，2步交易无须判断
         $node_params = [
-            'scheme' => 'http',
-            'host' => '172.16.100.77',
+            'scheme' => 'https',
+            'host' => 'jiedian1.bityuan.com',
             'port' => 8801
         ];
+
+        //测试环境查询共识高度
+        //2步交易情况下需要做高度判断
+//        $node_params = [
+//            'scheme' => 'http',
+//            'host' => '172.16.100.77',
+//            'port' => 8801
+//        ];
         $service = new Chain33Service($node_params);
         $result = $service->getHeight();
         $consensHeight = $result['result']['consensHeight'];
@@ -167,10 +168,9 @@ class CrossChainController extends Controller
             doEnd :
 
             //3步交易情况下需要做高度判断，2步交易注释IF判断
-            if (CoinCrossChain::RECHARGE == $val['is_with_draw'] && $val['step'] == 2 && $switch && isset($height) && ($consensHeight < $height)) {
+            if (CoinCrossChain::RECHARGE == (int)$val['is_with_draw'] && 2 == (int)$val['step'] && true == $switch && isset($height) && ($consensHeight < $height)) {
                 continue;
             }
-
             $currentModel = CoinCrossChain::findOne($val['id']);
             $currentModel->query_result = $query_result;
             $currentModel->msg = $msg;