diff --git a/.env.example b/.env.example index e2571180..6645e2c8 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,8 @@ APP_NAME=ProxyPanel -APP_ENV=production +APP_ENV=local APP_KEY= -APP_DEBUG=false -APP_DEMO=false +APP_DEBUG= +APP_DEMO= APP_URL=http://localhost APP_TIMEZONE=Asia/Shanghai APP_LOCALE=zh-CN diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 9df38d25..18b82fab 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -188,7 +188,7 @@ class UserController extends Controller // 非演示环境才可以修改管理员密码 $password = $request->input('password'); - if (! empty($password) && ! (env('APP_DEMO') && $user->id === 1)) { + if (! empty($password) && ! (config('app.demo') && $user->id === 1)) { $data['password'] = $password; } diff --git a/app/Http/Middleware/isForbidden.php b/app/Http/Middleware/isForbidden.php index 75a99907..0b37ed14 100644 --- a/app/Http/Middleware/isForbidden.php +++ b/app/Http/Middleware/isForbidden.php @@ -29,7 +29,7 @@ class isForbidden } // 拒绝通过订阅链接域名访问网站,防止网站被探测 - if (strpos(sysConfig('subscribe_domain'), $request->getHost()) !== false && strpos(sysConfig('website_url'), $request->getHost()) === false) { + if (config('app.env') === 'production' && sysConfig('website_url') && ! str_contains(sysConfig('website_url'), $request->getHost())) { Log::info('识别到通过订阅链接访问,强制跳转至百度('.IP::getClientIp().')'); return redirect('https://www.baidu.com'); diff --git a/database/seeds/PresetSeeder.php b/database/seeds/PresetSeeder.php index 7f926fb4..0767fdd3 100644 --- a/database/seeds/PresetSeeder.php +++ b/database/seeds/PresetSeeder.php @@ -507,6 +507,7 @@ class PresetSeeder extends Seeder // 生成初始管理账号 $user = Helpers::addUser('test@test.com', '123456', 100 * GB, sysConfig('default_days'), null, '管理员'); + $user->update(['status' => 1]); $user->assignRole('Super Admin'); } } diff --git a/routes/web.php b/routes/web.php index 8e4e6b80..9f3a97c3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,6 +1,6 @@ get('s/{code}', 'User\SubscribeController@getSubscribeByCode')->name('sub'); // 节点订阅地址