diff --git a/app/Admin/Controllers/AgentController.php b/app/Admin/Controllers/AgentController.php index cee2dbc..94d52f5 100644 --- a/app/Admin/Controllers/AgentController.php +++ b/app/Admin/Controllers/AgentController.php @@ -34,6 +34,7 @@ class AgentController extends AdminController if (strpos(Route::current()->uri, 'audit')) { $grid->model()->where('status', UserStatus::UNAUDITED); } + $grid->model()->where('id', '>', 1); //隐藏ID=1的领峰云管理员 $grid->column('id')->sortable(); $grid->column('username'); diff --git a/app/Admin/Controllers/GuideController.php b/app/Admin/Controllers/GuideController.php index 0e8014b..19469cc 100644 --- a/app/Admin/Controllers/GuideController.php +++ b/app/Admin/Controllers/GuideController.php @@ -28,7 +28,9 @@ class GuideController extends AdminController if (strpos(Route::current()->uri, 'audit')) { $grid->model()->where('status', UserStatus::UNAUDITED); } - $grid->column('id')->sortable(); + $grid->model()->where('id', '>', 1); //隐藏ID=1的领峰云管理员 + + $grid->column('id')->sortable(); $grid->column('username'); $grid->column('name'); $grid->column('photo')->image('', 60, 60); diff --git a/app/Admin/Controllers/SupplierController.php b/app/Admin/Controllers/SupplierController.php index 1c18681..3b55a28 100644 --- a/app/Admin/Controllers/SupplierController.php +++ b/app/Admin/Controllers/SupplierController.php @@ -31,6 +31,7 @@ class SupplierController extends AdminController if (strpos(Route::current()->uri, 'audit')) { $grid->model()->where('status', UserStatus::UNAUDITED); } + $grid->model()->where('id', '>', 1); //隐藏ID=1的领峰云管理员 $grid->column('id')->sortable(); $grid->column('username'); diff --git a/app/Http/Controllers/Api/LoginController.php b/app/Http/Controllers/Api/LoginController.php index e9a80a2..9ed3186 100644 --- a/app/Http/Controllers/Api/LoginController.php +++ b/app/Http/Controllers/Api/LoginController.php @@ -84,7 +84,7 @@ class LoginController extends Controller Cache::put('session_key_' . $userModel->id, $res['session_key']); //如果是新增,插入初始数据 - if ($userModel->wasRecentlyCreated) { + /*if ($userModel->wasRecentlyCreated) { $channel_ids = UserChannel::where('user_id', $userModel->id)->first(); //如果不存在则存入初始数据 if (!$channel_ids) { @@ -101,7 +101,7 @@ class LoginController extends Controller ]); } - } + }*/ $token_key = md5($userModel->id . env('APP_KEY')); Cache::put($token_key, $userModel->id); diff --git a/app/Http/Controllers/Api/SharePayController.php b/app/Http/Controllers/Api/SharePayController.php index 635e6f0..f352e2d 100644 --- a/app/Http/Controllers/Api/SharePayController.php +++ b/app/Http/Controllers/Api/SharePayController.php @@ -74,7 +74,7 @@ class SharePayController extends Controller $app = Factory::payment($config); try { $result = $app->order->unify([ - 'body' => $order->title, + 'body' => mb_substr($order->title, 0, 127), 'out_trade_no' => $order->order_no . '-' . $order->status, //后面加status,主要是为了方便微信支付回调时区分定金(首付款)和尾款支付 'total_fee' => round($price * 100), //支付金额单位为分 'notify_url' => route('wxpay_notify', ['agent_id' => $this->agent_id]), // 支付结果通知网址,如果不设置则会使用配置里的默认地址