Merge branch 'master' into dev

app/command/WelfareAccountCommand.php

@@ -33,7 +33,6 @@ class WelfareAccountCommand extends Command
         $accounts = MemberAccount::where('member_account_classify','WELFARE')->get()->toArray();
         Db::beginTransaction();
         try{
-            
             foreach($accounts as $account){
                 if ($account['member_account_income'] == '0.00' || $account['member_account_surplus'] == '0.00'){
                     echo "会员【" . $account['join_account_member_id'] . "】跳过\n";

app/functions.php

@@ -88,7 +88,12 @@ if (!function_exists('month_12')) {
 if (!function_exists('_syslog')) {
     function _syslog($name, $operation, $operationData = false, $requestParams = false, $adminId = false)
     {
-        $logAdminId = $adminId ? $adminId : \Tinywan\Jwt\JwtToken::getCurrentId();
+        try {
+            $adminId = $adminId ? $adminId : \Tinywan\Jwt\JwtToken::getCurrentId();
+        } catch (\Exception $e) {
+            $adminId = 1001;
+        }
+        $logAdminId = $adminId;
         $model = new \app\model\SysLog();
         $model->log_admin_id = $logAdminId;
         $model->log_name = $name;