Merge branch 'feature/ucenter' into 'master'

common/service/trusteeship/TrusteeShipService.php

@@ -8,14 +8,19 @@ use common\helpers\Curl;
 class TrusteeShipService
 {
     private $node_params;
+    private $header;
 
-    public function __construct($parameter = [])
+    public function __construct($parameter = [], $header = [])
     {
         $platform_id = Yii::$app->request->getPlatformId();
+        if (!empty($header)) {
+            $this->header = $header;
+        }
+
         if (empty($parameter)) {
-            $this->node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
+            $this->node_params = Yii::$app->params['trusteeship']['node_' . $platform_id]['url'];
         } else {
-            $this->node_params = $parameter;
+            $this->node_params = $parameter['url'];
         }
     }
 
@@ -28,9 +33,14 @@ class TrusteeShipService
     public function send($method = 'GET', $uri, $params = [])
     {
         $ch = new Curl();
+        if (!empty($this->header)) {
+            $ch->setHeaders($this->header);
+        }
+
         if (!empty($params)) {
             $ch->setGetParams($params);
         }
+
         $result = $ch->$method($this->urlBuild($uri), false);
         if (!$result) {
             return ['code' => -1, 'msg' => $ch->errorText];
@@ -62,4 +72,6 @@ class TrusteeShipService
 
         return $this->send("GET", $uri, $params);
     }
+
+
 }

wallet/base/BaseController.php

@@ -322,4 +322,14 @@ class BaseController extends Controller
         }
         return $params;
     }
+
+
+    protected function getSign($params, $appkey, $appSecret, $time)
+    {
+        ksort($params);
+        $string = http_build_query($params);
+        $result = md5($appkey . $string . $appSecret . $time);
+        $sign = strtoupper($result);
+        return $sign;
+    }
 }
\ No newline at end of file

wallet/controllers/UserController.php

@@ -155,7 +155,19 @@ class UserController extends BaseController
             'end_time' => $end_time
         ];
 
-        $service = new TrusteeShipService($node_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->getUserList($params);
         if (200 !== $result['code']) {
             return ['code' => $result['code'], 'data' => [], 'msg' => $result['msg']];

wallet/controllers/WalletController.php

@@ -53,7 +53,19 @@ class WalletController extends BaseController
             'size' => $size,
             'currency' => $currency
         ];
-        $service = new TrusteeShipService($node_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->getWalletBalance($params);
         if (200 !== $result['code']) {
             return ['code' => $result['code'], 'data' => [], 'msg' => $result['msg']];
@@ -69,11 +81,24 @@ class WalletController extends BaseController
         $params = [
             'uid' => $uid
         ];
-        $service = new TrusteeShipService($node_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->getUserAsset($params);
         if (200 !== $result['code']) {
             return ['code' => $result['code'], 'data' => [], 'msg' => $result['msg']];
         }
         return ['code' => 1, 'data' => $result['msg'], 'msg' => 'success'];
     }
+
 }
\ No newline at end of file