Merge branch 'master' of http://39.98.194.76:3000/txct/wanyue_app

app/api/controller/pay/WxpayController.php

@@ -96,4 +96,4 @@ class WxpayController
 //            'mode' => 'dev', // optional, dev/hk;当为 `hk` 时，为中国香港 gateway。
         ];
     }
-}
+}

app/command/WelfareAccountCommand.php

@@ -58,18 +58,6 @@ class WelfareAccountCommand extends Command
             echo "会员【" . $member['member_id'] . "】已处理完成\n";
         }
 
-
-
-        $payDetails = PayDetail::where('pay_category', 'RECHARGE')
-            ->get();
-        foreach ($payDetails as $payDetail){
-            $order = Order::where('order_groupby',$payDetail->join_pay_order_id)->first();
-            if($order){
-                $order->order_category = "RECHARGE";
-                $order->save();
-            }
-        }
-
         return self::SUCCESS;
     }
 

config/plugin/tinywan/jwt/app.php

@@ -26,7 +26,7 @@ return [
         // 缓存令牌时间，单位：秒。默认 7 天
         'cache_token_ttl' => 604800,
         // 缓存令牌前缀
-        'cache_token_pre' => 'JWT:TOKEN:',
+        'cache_token_pre' => 'JWT:TOKEN:'.getenv('JWT_ENV'),
         // 刷新缓存令牌前缀
 //        'cache_refresh_token_pre' => 'JWT:TOKEN:REFRESH:',
         // 用户信息模型