Merge branch 'develop'

app/Console/Commands/Qrcode.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Meta;
+use BlockMatrix\EosRpc\ChainFactory;
+use BlockMatrix\EosRpc\EosRpc;
+use BlockMatrix\EosRpc\WalletFactory;
+use Carbon\Carbon;
+use GuzzleHttp\Client;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use Org\Multilinguals\Apollo\Client\ApolloClient;
+use ZanySoft\Zip\Zip;
+
+class Qrcode extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'qrcode';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '重新生成二维码';
+
+    protected $save_dir = '';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->line('-----------start---------');
+        $metas = Meta::all();
+        foreach ($metas as $meta) {
+            $this->line('------开始:' . $meta['patch_num']);
+
+            Storage::put('chsy/qrcodes/'.$meta['patch_num'].'.png',\SimpleSoftwareIO\QrCode\Facades\QrCode::size(200)->generate("http://uptoyo.com/".$meta['id']));
+        }
+        $this->line('-----------end--------');
+    }
+}

app/Console/Commands/Trace.php

@@ -92,13 +92,13 @@ class Trace extends Command
             $md5 = md5_file($zipPath);
             $this->line('------ZIP包MD5码:' . $md5);
 
-            $zipUrl = '/trace/' .$meta['patch_num'] . ".zip";
+            $zipUrl = '/trace/' . $meta['patch_num'] . ".zip";
             Storage::put($zipUrl, file_get_contents($zipPath));
             $data = [
                 'md5' => $md5,
-                'zip' => env('OSS_URL').'trace/' .$meta['patch_num'] . ".zip"
+                'zip' => env('OSS_URL') . 'trace/' . $meta['patch_num'] . ".zip"
             ];
-            $this->line('zip地址:' . env('OSS_URL').'trace/' .$meta['patch_num'] . ".zip");
+            $this->line('zip地址:' . env('OSS_URL') . 'trace/' . $meta['patch_num'] . ".zip");
             //$md5 = md5(time());
             $this->line('------开始上链:' . $md5);
             $row = $this->transcation($md5);
@@ -136,7 +136,7 @@ class Trace extends Command
 
     protected function transcation($md5)
     {
-        try{
+        try {
             $api = (new ChainFactory())->api(base_path());
             $walapi = (new WalletFactory())->api(base_path());
             $eos = (new EosRpc($api, $walapi));
@@ -158,33 +158,31 @@ class Trace extends Command
             if (isset($bobBalance[0])) {
                 $balaceB = $bobBalance[0];
             }
-            if (floatval($balaceA) == 0 && floatval($balaceB) == 0) {
-                $this->line("两个账号都没钱了，快充钱");
+            if (floatval($balaceA) < $coin || floatval($balaceB) < $coin) {
+                $this->line("有个账号没钱了，快充钱");
                 return false;
             }
             $this->line("准备打开钱包");
             $walapi->open($walletName);
             $this->line("钱包已打开");
             $this->line("准备解锁钱包");
-            $walapi->unlock([$walletName,$walletPassword]);
+            $walapi->unlock([$walletName, $walletPassword]);
             $this->line("钱包已解锁");
             $this->line("准备发起交易");
-            if ($balaceB >= $coin * 2) {
+            $rand = rand(0, 1);
+            if ($rand == 0) {
                 $trans = $eos->transfer($accountB, $accountA, $coin . " " . $coinCode, $md5, 'eosio.token', false);
-            }elseif ($balaceA >= $coin * 2) {
+            } elseif ($rand == 1) {
                 $trans = $eos->transfer($accountA, $accountB, $coin . " " . $coinCode, $md5, 'eosio.token', false);
-            }else{
-                $this->line('账号余额不足');
-                return false;
             }
-            Log::debug('transinfo:'.\GuzzleHttp\json_encode($trans));
+            Log::debug('transinfo:' . \GuzzleHttp\json_encode($trans));
             return [
                 'transaction_id' => $trans['transaction_id'] ?? '',
                 'block_num' => $trans['processed']['block_num'] ?? 0,
                 'block_time' => $trans['processed']['block_time'] ?? ''
             ];
-        }catch (\Exception $exception){
-            $this->line('上链失败:'.$exception->getMessage());
+        } catch (\Exception $exception) {
+            $this->line('上链失败:' . $exception->getMessage());
             return false;
         }
     }

app/Console/Kernel.php

@@ -10,6 +10,7 @@ use App\Console\Commands\PostCollectBean;
 use App\Console\Commands\PostCreateBean;
 use App\Console\Commands\PostStatistics;
 use App\Console\Commands\PostYesterday;
+use App\Console\Commands\Qrcode;
 use App\Console\Commands\TopicUseCount;
 use App\Console\Commands\Trace;
 use App\Console\Commands\UpdatePostInfo;
@@ -32,6 +33,7 @@ class Kernel extends ConsoleKernel
     protected $commands = [
         Apollo::class,
         Trace::class,
+        Qrcode::class,
     ];
 
     /**

app/Http/Controllers/MetaController.php

@@ -12,6 +12,7 @@ namespace App\Http\Controllers;
 use App\Repositories\MetaRepository;
 use App\Transformers\MetaTransformer;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
 use League\Fractal\Manager;
 use League\Fractal\Resource\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;

app/Repositories/MetaRepository.php

@@ -13,6 +13,7 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
 use SimpleSoftwareIO\QrCode\Facades\QrCode;
 
 class MetaRepository {
@@ -67,7 +68,7 @@ class MetaRepository {
             $meta = $this->meta->create($data);
 
             DB::commit();
-            QrCode::generate("http://uptoyo.com/".$meta['id'],public_path().'/qrcodes/'.$meta['patch_num'].'.png');
+            Storage::put('chsy/qrcodes/'.$meta['patch_num'].'.png',QrCode::size(200)->generate("http://uptoyo.com/".$meta['id']));
             return Response::create();
         }catch (QueryException $exception){
             DB::rollBack();

app/Transformers/MetaTransformer.php

@@ -39,7 +39,7 @@ class MetaTransformer extends TransformerAbstract
             "trans_id" => $meta['trans_id'],
             "block_height" => $meta['block_height'],
             "block_time" => $meta['block_time'],
-            "qrcode" => 'public/qrcodes/'.$meta['patch_num'].'.png',
+            "qrcode" => env('OSS_URL').'chsy/qrcodes/'.$meta['patch_num'].'.png',
             "created_at" => Carbon::parse($meta['created_at'])->toDateTimeString(),
             "updated_at" => Carbon::parse($meta['updated_at'])->toDateTimeString(),
         ];