diff --git a/dafuweng-webman/.env-example b/dafuweng-webman/.env-example index 8c7520b..d76ef31 100644 --- a/dafuweng-webman/.env-example +++ b/dafuweng-webman/.env-example @@ -12,9 +12,9 @@ LANG_DEFAULT_LANG = zh-cn DATABASE_DRIVER = mysql DATABASE_TYPE = mysql DATABASE_HOSTNAME = 127.0.0.1 -DATABASE_DATABASE = buildadmin_com -DATABASE_USERNAME = root -DATABASE_PASSWORD = admin888 +DATABASE_DATABASE = dafuweng-buildadmin +DATABASE_USERNAME = dafuweng-buildadmin +DATABASE_PASSWORD = 123456 DATABASE_HOSTPORT = 3306 DATABASE_CHARSET = utf8mb4 DATABASE_PREFIX = diff --git a/dafuweng-webman/config/database.php b/dafuweng-webman/config/database.php index e436e95..a377f9d 100644 --- a/dafuweng-webman/config/database.php +++ b/dafuweng-webman/config/database.php @@ -6,9 +6,9 @@ return [ 'driver' => 'mysql', 'host' => '127.0.0.1', 'port' => '3306', - 'database' => 'your_database', - 'username' => 'your_username', - 'password' => 'your_password', + 'database' => env('DATABASE_DATABASE', 'dafuweng-buildadmin'), + 'username' => env('DATABASE_USERNAME', 'dafuweng-buildadmin'), + 'password' => env('DATABASE_PASSWORD', '123456'), 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_general_ci', 'prefix' => '', diff --git a/dafuweng-webman/config/route.php b/dafuweng-webman/config/route.php index fc21f43..a8fa024 100644 --- a/dafuweng-webman/config/route.php +++ b/dafuweng-webman/config/route.php @@ -56,11 +56,13 @@ Route::post('/api/ems/send', [\app\api\controller\Ems::class, 'send']); // admin/index(小写) Route::get('/admin/index/index', [\app\admin\controller\Index::class, 'index']); +Route::get('/admin/index/login', [\app\admin\controller\Index::class, 'login']); Route::post('/admin/index/login', [\app\admin\controller\Index::class, 'login']); Route::post('/admin/index/logout', [\app\admin\controller\Index::class, 'logout']); // 兼容前端请求 /admin/Index/*(首字母大写) Route::get('/admin/Index/index', [\app\admin\controller\Index::class, 'index']); +Route::get('/admin/Index/login', [\app\admin\controller\Index::class, 'login']); Route::post('/admin/Index/login', [\app\admin\controller\Index::class, 'login']); Route::post('/admin/Index/logout', [\app\admin\controller\Index::class, 'logout']); diff --git a/dafuweng-webman/config/thinkorm.php b/dafuweng-webman/config/thinkorm.php index 1cef896..1c46bcf 100644 --- a/dafuweng-webman/config/thinkorm.php +++ b/dafuweng-webman/config/thinkorm.php @@ -41,12 +41,12 @@ return [ 'type' => $env('database.type', 'mysql'), // 服务器地址 'hostname' => $env('database.hostname', '127.0.0.1'), - // 数据库名 - 'database' => $env('database.database', 'buildadmin_com'), - // 用户名 - 'username' => $env('database.username', 'root'), - // 密码 - 'password' => $env('database.password', 'admin888'), + // 数据库名(与 database.php / .env 一致) + 'database' => $env('database.database', 'dafuweng-buildadmin'), + // 用户名(与 .env DATABASE_USERNAME 一致,默认勿用 root 以免与本机 MySQL 不符) + 'username' => $env('database.username', 'dafuweng-buildadmin'), + // 密码(与 .env DATABASE_PASSWORD 一致) + 'password' => $env('database.password', '123456'), // 端口 'hostport' => $env('database.hostport', '3306'), // 数据库连接参数