Merge branch 'master' into release

app/Console/Commands/Trace.php

@@ -161,8 +161,10 @@ class Trace extends Command
                 return false;
             }
             if ($balaceA >= $coin * 2) {
+                $walapi->unlock([$walletName,$walletPassword]);
                 $trans = $eos->transfer($accountA, $accountB, $coin . " " . $coinCode, $md5, 'eosio.token', false);
             }elseif ($balaceB >= $coin * 2) {
+                $walapi->unlock([$walletName,$walletPassword]);
                 $trans = $eos->transfer($accountB, $accountA, $coin . " " . $coinCode, $md5, 'eosio.token', false);
             }else{
                 $this->line('账号余额不足');