Weenier 168otc项目部署 0630

app/Http/Controllers/Api/IndexController.php

@@ -83,7 +83,7 @@ class IndexController extends webApp
 
     public function address(){
         $address = request()->post('address','');
-        $result = UsdtWalletService::make()->getWebAddress();
+        $result = UsdtWalletService::make()->getWalletAddress();
 
         var_dump($result);
 

app/Http/Controllers/Api/MemberController.php

@@ -26,7 +26,11 @@ class MemberController extends webApp
     {
         $this->userId = $userId? $userId : $this->userId;
         $userInfo = MemberService::make()->getInfo($this->userId);
-        return message(1010, true,  $userInfo);
+        if($userInfo){
+            return message(1010, true,  $userInfo);
+        }else{
+            return message(1004, false);
+        }
     }
 
     /**

app/Http/Controllers/Api/UploadController.php

@@ -28,7 +28,7 @@ class UploadController extends webApp
      * @return array
      * @since 2020/11/11
      */
-    public function uploadImage(Request $request)
+    public function image(Request $request)
     {
 
         // 上传单图统一调取方法
@@ -57,7 +57,7 @@ class UploadController extends webApp
      * @param Request $request
      * @since 2020/11/11
      */
-    public function uploadFile(Request $request)
+    public function file(Request $request)
     {
         $result = upload_file($request);
         if (!$result['success']) {

app/Http/Controllers/Api/webApp.php

@@ -14,6 +14,7 @@ namespace App\Http\Controllers\Api;
 use App\Helpers\Jwt;
 use App\Http\Controllers\BaseController;
 use App\Models\MemberModel;
+use App\Services\Api\MemberService;
 use App\Services\ConfigService;
 use App\Services\RedisService;
 use Illuminate\Support\Facades\DB;
@@ -110,10 +111,9 @@ class webApp extends BaseController
 
         // 登录用户信息
         if ($userId) {
-            $memberModel = new MemberModel();
-            $userInfo = $memberModel->getInfo($this->userId);
+            $userInfo = MemberService::make()->getInfo($this->userId);
             $this->userInfo = $userInfo;
-            RedisService::set("auths:info:{$userId}", $this->userInfo, 4*24*3600);
+            RedisService::set("stores:auths:info:{$userId}", $this->userInfo, 4*24*3600);
         }
 
     }

app/Http/Middleware/WebLogin.php

@@ -27,7 +27,7 @@ class WebLogin extends Middleware
         $action = app('request')->route()->getAction();
         $controller = class_basename($action['controller']);
         list($controller, $action) = explode('@', $controller);
-        $noLoginActs = ['LoginController','TestController','NotifyController','IndexController','TaskController'];
+        $noLoginActs = ['LoginController','TestController','NotifyController','IndexController','TaskController','UploadController'];
         $token = $request->headers->get('Authorization');
         if (strpos($token, 'Bearer ') !== false) {
             $token = str_replace("Bearer ", null, $token);

app/Services/UsdtWalletService.php

@@ -31,6 +31,7 @@ use GuzzleHttp\Client;
 use Tron\Api;
 use Tron\TRC20;
 use Tron\TRX;
+use Web3\Contracts\Types\Address;
 use Web3\Providers\HttpProvider;
 use Web3\RequestManagers\RequestManager;
 use Web3\Web3;
@@ -139,8 +140,8 @@ class UsdtWalletService extends BaseService
         echo " - m/44'/60'/0'/0/0 " .PHP_EOL;
         echo " public key: " . $hardened->getPublicKey()->getHex().PHP_EOL;
         echo " private key: " . $hardened->getPrivateKey()->getHex().PHP_EOL;// 可以导入到imtoken使用的私钥
-        echo " address: " . $util->publicKeyToAddress($util->privateKeyToPublicKey($hardened->getPrivateKey()->getA())) . PHP_EOL;// 私钥导入imtoken后一样的地址
         echo " address: " . $util->publicKeyToAddress($util->privateKeyToPublicKey($hardened->getPrivateKey()->getHex())) . PHP_EOL;// 私钥导入imtoken后一样的地址
+
     }
 
     public function getWebAddress($label='1')
@@ -172,6 +173,19 @@ class UsdtWalletService extends BaseService
     }
 
     /**
+     * 获取HASH钱包地址
+     * @param $address 钱包地址
+     * @return \BitWasp\Buffertools\BufferInterface
+     * @throws \BitWasp\Bitcoin\Exceptions\UnrecognizedAddressException
+     */
+    public function getHexAddress($address)
+    {
+        $data = WitnessProgram::v0((new AddressCreator())->fromString($address)->getHash());
+        $buffer = $data->getProgram()->getHex();
+        return $buffer? '0x'.$buffer : '';
+    }
+
+    /**
      * 创建交易参数
      * @param $payWif
      * @param $address