mirror of
				https://github.com/v2board/v2board.git
				synced 2025-10-31 09:21:46 +08:00 
			
		
		
		
	Merge branch 'dev'
This commit is contained in:
		| @@ -3,6 +3,7 @@ | ||||
| namespace App\Console\Commands; | ||||
|  | ||||
| use App\Models\Plan; | ||||
| use App\Models\StatServer; | ||||
| use App\Models\StatUser; | ||||
| use App\Utils\Helper; | ||||
| use Illuminate\Console\Command; | ||||
| @@ -43,7 +44,7 @@ class ResetLog extends Command | ||||
|      */ | ||||
|     public function handle() | ||||
|     { | ||||
|         StatUser::where('record_at', '<', strtotime('-2 month', time())) | ||||
|             ->delete(); | ||||
|         StatUser::where('record_at', '<', strtotime('-2 month', time()))->delete(); | ||||
|         StatServer::where('record_at', '<', strtotime('-2 month', time()))->delete(); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -48,7 +48,9 @@ class V2boardInstall extends Command | ||||
|             $this->info("  \ V /  / __/| |_) | (_) | (_| | | | (_| | "); | ||||
|             $this->info("   \_/  |_____|____/ \___/ \__,_|_|  \__,_| "); | ||||
|             if (\File::exists(base_path() . '/.env')) { | ||||
|                 abort(500, 'V2board 已安装,如需重新安装请删除目录下.env文件'); | ||||
|                 $defaultSecurePath = hash('crc32b', config('app.key')); | ||||
|                 $this->info("访问 http(s)://你的站点/{$defaultSecurePath} 进入管理面板,你可以用户中心修改你的密码。"); | ||||
|                 abort(500, '如需重新安装请删除目录下.env文件'); | ||||
|             } | ||||
|  | ||||
|             if (!copy(base_path() . '/.env.example', base_path() . '/.env')) { | ||||
| @@ -98,7 +100,7 @@ class V2boardInstall extends Command | ||||
|             $this->info("管理员邮箱:{$email}"); | ||||
|             $this->info("管理员密码:{$password}"); | ||||
|  | ||||
|             $defaultSecurePath = crc32(config('app.key')); | ||||
|             $defaultSecurePath = hash('crc32b', config('app.key')); | ||||
|             $this->info("访问 http(s)://你的站点/{$defaultSecurePath} 进入管理面板,你可以用户中心修改你的密码。"); | ||||
|         } catch (\Exception $e) { | ||||
|             $this->error($e->getMessage()); | ||||
|   | ||||
| @@ -108,7 +108,7 @@ class ConfigController extends Controller | ||||
|                 'register_limit_by_ip_enable' => (int)config('v2board.register_limit_by_ip_enable', 0), | ||||
|                 'register_limit_count' => config('v2board.register_limit_count', 3), | ||||
|                 'register_limit_expire' => config('v2board.register_limit_expire', 60), | ||||
|                 'secure_path' => config('v2board.secure_path', config('v2board.frontend_admin_path', crc32(config('app.key')))) | ||||
|                 'secure_path' => config('v2board.secure_path', config('v2board.frontend_admin_path', hash('crc32b', config('app.key')))) | ||||
|             ], | ||||
|             'subscribe' => [ | ||||
|                 'plan_change_enable' => (int)config('v2board.plan_change_enable', 1), | ||||
| @@ -177,7 +177,7 @@ class ConfigController extends Controller | ||||
|                 continue; | ||||
|             } | ||||
|             if (array_key_exists($k, $data)) { | ||||
|                 $config[$k] = $data[$k]; | ||||
|                 $config[$k] = trim($data[$k]); | ||||
|             } | ||||
|         } | ||||
|         $data = var_export($config, 1); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user