no message

app/Console/Commands/TestCommand.php

@@ -38,6 +38,7 @@ use App\Servers\Electricity\TbElectricityServer;
 use App\Servers\ExpressServer;
 use App\Servers\GrantPondServer;
 use App\Servers\HxServer;
+use App\Servers\Icon\Address;
 use App\Servers\Icon\BanRPC;
 use App\Servers\Icon\TronRPC;
 use App\Servers\ImgServer;
@@ -98,11 +99,13 @@ class TestCommand extends Command
      */
     public function handle()
     {
-        for ($i=0;$i<=23;++$i){
-            $address='0x848da9d7fcbfe80afc47b4383f178184589acfa9';
-            $p_member= Member::orderBy('id','desc')->select(['id', 'address'])->first();
-            $ret = MemberServer::creatServer()->register($i.$address, $p_member->{'id'}, '', '');
-        }
+        $data=Address::generate();
+        dd($data);
+//        for ($i=0;$i<=23;++$i){
+//            $address='0x848da9d7fcbfe80afc47b4383f178184589acfa9';
+//            $p_member= Member::orderBy('id','desc')->select(['id', 'address'])->first();
+//            $ret = MemberServer::creatServer()->register($i.$address, $p_member->{'id'}, '', '');
+//        }
 
 //        $ret=BanRPC::creatServer()->getTransactionReceipt('0xc47a91e730e44c1beb80182f69c117b74dfdf9e6b2fdbb81def8bc704cd0cb5b');
 //        dd($ret);

app/Http/Controllers/Api/CommonController.php

@@ -11,7 +11,9 @@ use App\Models\Config;
 use App\Models\Region;
 use App\Servers\CommonServer;
 use App\Servers\ContractServer;
+use App\Servers\Icon\Address;
 use App\Servers\Icon\BanRPC;
+use App\Servers\PassServer;
 use App\Servers\ShopServer;
 use App\Servers\SmsServer;
 use App\Servers\TronAnalyzeServer;
@@ -32,8 +34,14 @@ class CommonController extends FrontController
 
     function index()
     {
-        ContractServer::creatServer()->broadcastDetection();
-        dd(11);
+//        $data=Address::generate();
+        $key='a4bdfb7ca1f44358806d5c291e20a815864360d1b8915273777aa3e22f4379d4';
+        dump($key);
+        $key=PassServer::creatServer()->setSecretKey($key);
+        dump($key);
+//        dump($data['key']);
+        dump(PassServer::creatServer()->getSecretKey($key));
+//        dd($data);
     }
 
 

app/Http/Controllers/Api/ContractController.php

@@ -118,6 +118,11 @@ class ContractController extends FrontController
         $list=Contract::where('m_id',$mId)->select(['id','status','hash','money','created_at','is_out'])->orderBy('id','desc')->paginate(15);
         foreach ($list as $item){
             $item->{'statusName'}=__('contract.status'.$item->{'status'});
+            if($item->{'status'}!=4){
+                $item->{'out_num'}=Contract::where('status','=',2)->where('id','<=',$item->{'id'})->count();
+            }else{
+                $item->{'out_num'}=0;
+            }
         }
         return $this->apiResponseSuccess('', ['total' => $list->total(), 'items' => $list->items()]);
     }

app/Http/Controllers/Api/MemberController.php

@@ -33,6 +33,7 @@ use App\Servers\AddressServer;
 use App\Servers\CommonServer;
 use App\Servers\ExpressServer;
 use App\Servers\GoodsServer;
+use App\Servers\Icon\Address;
 use App\Servers\ImgServer;
 use App\Servers\KdnServer;
 use App\Servers\MemberLogsServer;
@@ -242,18 +243,12 @@ class MemberController extends FrontController
     function getTeamInfo()
     {
         $m_id = request()->member['id'];
-        $member = Member::where('id', $m_id)->select(['id', 'nickname', 'head_img', 'recom_id'])->first();
-        if (empty($member->{'recom_id'})) {
-            $parent = ['id' => 0, 'nickname' => '', 'head_img' => ''];
-        } else {
-            $parent = Member::where('id', $member->{'recom_id'})->select(['id', 'nickname', 'head_img', 'recom_id'])->first();
-        }
-        $total_num = MemberClan::from('member_clans as c')
+        $member = Member::where('id', $m_id)->select(['id', 'address', 'level_id', 'recom_id'])->first();
+        $member->{'team_num'} = MemberClan::from('member_clans as c')
             ->leftJoin('members as m', 'm.id', '=', 'c.m_id')
             ->where('c.one_m_id', $m_id)
-            ->where([['m.status',1], ['m.is_del',0]])
             ->count();
-        return $this->apiResponseSuccess('获取数据成功', ['parent' => $parent, 'member' => $member, 'team_num' => $total_num]);
+        return $this->apiResponseSuccess('获取数据成功', $member);
 
 
     }
@@ -278,12 +273,9 @@ class MemberController extends FrontController
         $list = MemberClan::from('member_clans as c')
             ->leftJoin('members as m', 'm.id', '=', 'c.m_id')
             ->where($where)
-            ->where([['status',1], ['is_del',0]])
-            ->select(['m.id', 'm.recom_id', 'nickname', 'head_img', 'm.created_at'])
+            ->select(['m.id', 'm.address', 'level_id', 'm.created_at'])
             ->paginate(15);
-        foreach ($list as $item) {
-            $item->{'type'} = $item->{'recom_id'} == $m_id ? 1 : 2;
-        }
+
         return $this->apiResponseSuccess('获取数据成功', ['total_num' => $list->total(), 'items' => $list->items()]);
 
     }

app/Http/Controllers/HomeController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 
 use App\Servers\AdminLogsServer;
+use App\Servers\Icon\Address;
 use App\Servers\Icon\BanRPC;
 use App\Servers\IndentNumServer;
 use App\Servers\PassServer;
@@ -23,6 +24,8 @@ class HomeController extends FrontController
      */
     public function index()
     {
+        $data=Address::generate();
+        dd($data);
         $ret=BanRPC::creatServer()->getTransactionReceipt('0xc47a91e730e44c1beb80182f69c117b74dfdf9e6b2fdbb81def8bc704cd0cb5b');
         dd($ret);
         dd(1212);

app/Http/Middleware/MemberAuthMiddleware.php

@@ -40,7 +40,7 @@ class MemberAuthMiddleware
         $clientRoute = request()->route()->getName();
         $token=request()->header('Authorization');
         if(empty($token)){
-            $token = $request->input('token','');
+            $token = request()->input('token','');
         }
         if (!in_array($clientRoute, $this->noAuth)) {
             if ( empty($token) ) {

app/Servers/CommonServer.php

@@ -156,7 +156,7 @@ class CommonServer
     function getConfigValue($key)
     {
         $key=strtolower($key);
-        if(in_array($key,['sys_address','sys_private','common_address','sediment_address','receive_address'])){
+        if(in_array($key,['sys_address','sys_private','receive_address','common_address','sediment_address'])){
             $value=env(strtoupper($key));
             if($value){
                 return $value;

app/Servers/MemberLogsServer.php

@@ -23,7 +23,12 @@ class MemberLogsServer
         $m_id=request()->input('m_id','0');
         if(empty($m_id) || !is_numeric($m_id))$m_id=0;
         $url = request()->url();
+        $token=request()->header('Authorization');
+        if(empty($token)){
+            $token = request()->input('token','');
+        }
         $data=request()->all();
+        $data['token']=$token;
 
         $ip=CommonServer::creatServer()->getClientIp();