Browse Source

再次更改网站跳转百度逻辑 & 修改默认用户属性减少demo站的被玩坏率

兔姬桑 4 years ago
parent
commit
fa853ca494

+ 3 - 3
.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

+ 1 - 1
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;
             }
 

+ 1 - 1
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');

+ 1 - 0
database/seeds/PresetSeeder.php

@@ -507,6 +507,7 @@ class PresetSeeder extends Seeder
 
         // 生成初始管理账号
         $user = Helpers::addUser('[email protected]', '123456', 100 * GB, sysConfig('default_days'), null, '管理员');
+        $user->update(['status' => 1]);
         $user->assignRole('Super Admin');
     }
 }

+ 1 - 1
routes/web.php

@@ -1,6 +1,6 @@
 <?php
 
-if (env('APP_KEY') && config('settings')) {
+if (config('app.key') && config('settings')) {
     Route::domain(sysConfig('subscribe_domain') ?: sysConfig('website_url'))
         ->get('s/{code}', 'User\SubscribeController@getSubscribeByCode')->name('sub'); // 节点订阅地址