feat:k线周期转换修复

@@ -379,19 +379,19 @@ class CmBroker
         }
         }
         if ($platTarget == self::PLAT_OKX) {
         if ($platTarget == self::PLAT_OKX) {
             $arr = [
             $arr = [
-                '1s' => 'candle1s',
-                '1m' => 'candle1m',
-                '3m' => 'candle3m',
-                '5m' => 'candle5m',
-                '15m' => 'candle15m',
-                '30m' => 'candle30m',
-                '1h' => 'candle1H',
-                '2h' => 'candle2H',
-                '4h' => 'candle4H',
-                '6h' => 'candle6H',
-                '12h' => 'candle12H',
-                '1d' => 'candle1D',
-                '1w' => 'candle1W',
+                '1s' => '1s',
+                '1m' => '1m',
+                '3m' => '3m',
+                '5m' => '5m',
+                '15m' => '15m',
+                '30m' => '30m',
+                '1h' => '1H',
+                '2h' => '2H',
+                '4h' => '4H',
+                '6h' => '6H',
+                '12h' => '12H',
+                '1d' => '1D',
+                '1w' => '1W',
             ];
             ];
             if (!isset($arr[$period])) {
             if (!isset($arr[$period])) {
                 throw new Exception('周期错误,' . $this->plat . '不支持的周期' . $period);
                 throw new Exception('周期错误,' . $this->plat . '不支持的周期' . $period);
@@ -721,8 +721,9 @@ class CmBroker
     public function getKlines($symbol, $peroid, $limit = 100)
     public function getKlines($symbol, $peroid, $limit = 100)
     {
     {
         $symbolOri = $this->getSymbolOri($symbol);
         $symbolOri = $this->getSymbolOri($symbol);
+        $peroidOri = $this->getPeriodOri($this->plat, $peroid);
         if ($this->plat == self::PLAT_OKX) {
         if ($this->plat == self::PLAT_OKX) {
-            $res = $this->exBroker->getKlines($symbolOri, $peroid, $limit);
+            $res = $this->exBroker->getKlines($symbolOri, $peroidOri, $limit);
             if ($res['code'] != '0') {
             if ($res['code'] != '0') {
                 return [];
                 return [];
             }
             }

@@ -73,7 +73,7 @@ class ExBroker
                 $subData['op'] = 'subscribe';
                 $subData['op'] = 'subscribe';
                 $subData['args'] = [
                 $subData['args'] = [
                     [
                     [
-                        'channel' => $period,
+                        'channel' => 'candle' . $period,
                         'instId' => $symbol,
                         'instId' => $symbol,
                     ],
                     ],
                 ];
                 ];