Weenier 168otc项目部署 0630

1

app/Http/Controllers/Api/LoginController.php

@@ -58,7 +58,7 @@ class LoginController extends webApp
         }
 
         if($params['code'] != 123456 && !$this->checkCode($params['username'], $params['code'], 'reg')){
-//            return message($this->error, false);
+            return message($this->error, false);
         }
 
         if(!MemberService::make()->register($params)){
@@ -113,6 +113,7 @@ class LoginController extends webApp
 
         // 手机短信
         if($type == 1){
+
             if(!SmsService::make()->sendCode($username, $scene)){
                 return message(SmsService::make()->getError(), false);
             }

app/Http/Controllers/Api/TestController.php

@@ -27,7 +27,7 @@ class TestController extends webApp
 
     public function index()
     {
-        $result = UsdtWalletService::make()->usdtTrcTrigger(true);
+        $result = UsdtWalletService::make()->getTrxAddress();
         if(!$result){
             return message(UsdtWalletService::make()->getError(), false);
         }

app/Models/MemberModel.php

@@ -32,7 +32,7 @@ class MemberModel extends BaseModel
      */
     public function getInfo($id)
     {
-        $info = parent::getInfo($id); // TODO: Change the autogenerated stub
+        $info = MemberModel::where(['id'=> $id])->first(); // TODO: Change the autogenerated stub
         if ($info) {
             // 头像
             if (isset($info['avatar'])) {

app/Services/Api/MemberService.php

@@ -129,7 +129,7 @@ class MemberService extends BaseService
 
         // 生成trc2.0钱包地址
         $trcAddress = UsdtWalletService::make()->getTrxAddress();
-        var_dump($trcAddress);
+
         if ($trcAddress) {
             $data['trc_wif'] = isset($trcAddress['wif']) ? $trcAddress['wif'] : '';
             $data['trc_hexaddress'] = isset($trcAddress['hexAddress']) ? $trcAddress['hexAddress'] : '';
@@ -139,7 +139,6 @@ class MemberService extends BaseService
             return false;
         }
 
-        var_dump(666);
         // 生erc2.0钱包地址
         $ercAddress = UsdtWalletService::make()->getErcAddress();
         if ($trcAddress) {
@@ -150,7 +149,7 @@ class MemberService extends BaseService
             $this->error = 2202;
             return false;
         }
-return false;
+
         if ($id = $this->model->edit($data)) {
             MemberSettingService::make()->getInfo($id);
             return true;

app/Services/SmsService.php

@@ -61,6 +61,7 @@ class SmsService extends BaseService
             $cacheKey = "stores:codes:sms_{$scene}:" . substr($mobile, -3, 3) . '_' . md5($mobile);
             $apiUrl = isset($this->config['sms_api_url']['value']) ? $this->config['sms_api_url']['value'] : '';
             if (empty($mobile) || empty($apiUrl)) {
+                $this->error = '1013';
                 return false;
             }
 
@@ -84,17 +85,20 @@ class SmsService extends BaseService
                 'sendTime' => '', // 发送时间：空立即发送
             ];
 
+            RedisService::set($cacheKey . '_temp', ['mobile' => $mobile, 'code' => $code, 'date' => date('Y-m-d H:i:s')], 600);
             RedisService::set($cacheKey . '_lock', ['mobile' => $mobile, 'code' => $code, 'date' => date('Y-m-d H:i:s')], rand(10, 20));
             $result = curl_post($apiUrl, $data);
             $result = $result ? xmlToArray($result) : [];
             $status = isset($result['returnstatus']) ? $result['returnstatus'] : '';
-            if ($status == 'Success') {
+            if ($status === 'Success') {
                 RedisService::set($cacheKey, ['mobile' => $mobile, 'code' => $code, 'date' => date('Y-m-d H:i:s')], 300);
                 return true;
             }
 
+            $this->error = '1011';
             return false;
         } catch (\Exception $exception) {
+
             $this->error = $exception->getMessage();
             return false;
         }

app/Services/UsdtWalletService.php

@@ -81,32 +81,23 @@ class UsdtWalletService extends BaseService
      */
     public function getTrxAddress()
     {
-       try {
-           $api = new Api(new Client(['base_uri' => $this->config['tron_api_url']]));
+//       try {
+          $headers = ["TRON-PRO-API-KEY" => $this->config['tron_api_key']];
+           $api = new Api(new Client(['base_uri' => $this->config['tron_api_url'], $headers]));
 
            $trxWallet = new TRX($api);
            $addressData = $trxWallet->generateAddress();
+           var_dump($addressData);
            $addressData = (array)$addressData;
            return ['wif' => $addressData['privateKey'], 'hexAddress' => $addressData['hexAddress'], 'address' => $addressData['address']];
 
-       } catch (\Exception $exception){
-
-           $this->error = $exception->getMessage();
-           return false;
-       }
+//       } catch (\Exception $exception){
+//
+//           $this->error = $exception->getMessage();
+//           return false;
+//       }
     }
 
-    /**
-     * 获取TRC2.0钱包地址
-     * @throws \Tron\Exceptions\TronErrorException
-     */
-    public function getTrxAddress1($userId = 0)
-    {
-        $api = new Api(new Client(['base_uri' => $this->config['tron_api_url']]));
-
-        $trxWallet = new TRX($api);
-        $addressData = $trxWallet->generateAddress();
-    }
 
     /**
      * trx 转账