From b252545ebd11af2c2ad61fb90bcdb7084e747436 Mon Sep 17 00:00:00 2001 From: catsworld <519418441@qq.com> Date: Tue, 7 Jun 2016 18:07:50 +0800 Subject: [PATCH] Temporarily finish the migrations and models. --- app/Http/routes.php | 4 ++- .../2014_10_12_000000_create_users_table.php | 10 +++--- ...03_27_014942_create_transactions_table.php | 35 ------------------- ...16_03_28_222053_create_user_info_table.php | 4 +-- ...016_06_07_001111_create_messages_table.php | 10 +++--- ...016_06_07_001341_create_auth_log_table.php | 6 ++-- ...07_001559_create_transaction_log_table.php | 10 +++--- ...06_07_001722_create_transactions_table.php | 10 +++--- 8 files changed, 28 insertions(+), 61 deletions(-) delete mode 100644 database/migrations/2016_03_27_014942_create_transactions_table.php diff --git a/app/Http/routes.php b/app/Http/routes.php index 3b040b4..a522a6c 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -30,4 +30,6 @@ Route::group(['middleware' => ['web']], function () { // }); -Route::get('/good', 'GoodController@getList'); \ No newline at end of file +Route::get('/good', [ + "uses" => "GoodController@getList" +]); \ No newline at end of file diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 6f7448c..7be4b0c 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -14,14 +14,14 @@ class CreateUsersTable extends Migration { Schema::create('users', function (Blueprint $table) { $table->increments('id'); - $table->integer('priviledge'); + $table->integer('priviledge'); $table->string('username')->unique(); $table->string('password'); - $table->string('stuid'); - $table->string('SSO'); - $table->string('nickname'); + $table->string('stuid'); + $table->string('SSO'); + $table->string('nickname'); $table->string('email')->unique(); - $table->integer('role_id'); + $table->integer('role_id'); $table->timestamps(); }); } diff --git a/database/migrations/2016_03_27_014942_create_transactions_table.php b/database/migrations/2016_03_27_014942_create_transactions_table.php deleted file mode 100644 index 91ef9e9..0000000 --- a/database/migrations/2016_03_27_014942_create_transactions_table.php +++ /dev/null @@ -1,35 +0,0 @@ -increments('id'); - $table->integer('trans_id'); - $table->integer('buyer_id'); - $table->integer('seller_id'); - $table->integer('good_id'); - $table->integer('status'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('transactions'); - } -} diff --git a/database/migrations/2016_03_28_222053_create_user_info_table.php b/database/migrations/2016_03_28_222053_create_user_info_table.php index 652d356..3e886bd 100644 --- a/database/migrations/2016_03_28_222053_create_user_info_table.php +++ b/database/migrations/2016_03_28_222053_create_user_info_table.php @@ -18,8 +18,8 @@ class CreateUserinfoTable extends Migration $table->string('realname'); $table->string('tel_num'); $table->string('address'); - $table->string('last_login_ip'); - $table->string('register_ip'); + $table->string('last_login_ip'); + $table->string('register_ip'); $table->timestamps(); }); } diff --git a/database/migrations/2016_06_07_001111_create_messages_table.php b/database/migrations/2016_06_07_001111_create_messages_table.php index 5ebba95..65eaa64 100644 --- a/database/migrations/2016_06_07_001111_create_messages_table.php +++ b/database/migrations/2016_06_07_001111_create_messages_table.php @@ -14,11 +14,11 @@ class CreateMessagesTable extends Migration { Schema::create('messages', function (Blueprint $table) { $table->increments('message_id'); - $table->integer('cat_id'); - $table->integer('user_id'); - $table->integer('good_id'); - $table->integer('shop_id'); - $table->string('content'); + $table->integer('cat_id'); + $table->integer('user_id'); + $table->integer('good_id'); + $table->integer('shop_id'); + $table->string('content'); $table->timestamps(); }); } diff --git a/database/migrations/2016_06_07_001341_create_auth_log_table.php b/database/migrations/2016_06_07_001341_create_auth_log_table.php index 614fa7e..8311a1b 100644 --- a/database/migrations/2016_06_07_001341_create_auth_log_table.php +++ b/database/migrations/2016_06_07_001341_create_auth_log_table.php @@ -14,9 +14,9 @@ class CreateAuthLogTable extends Migration { Schema::create('auth_log', function (Blueprint $table) { $table->increments('id'); - $table->string('ip'); - $table->string('username'); - $table->integer('event'); + $table->string('ip'); + $table->string('username'); + $table->integer('event'); $table->timestamps(); }); } diff --git a/database/migrations/2016_06_07_001559_create_transaction_log_table.php b/database/migrations/2016_06_07_001559_create_transaction_log_table.php index ebe5f82..c917615 100644 --- a/database/migrations/2016_06_07_001559_create_transaction_log_table.php +++ b/database/migrations/2016_06_07_001559_create_transaction_log_table.php @@ -14,11 +14,11 @@ class CreateTransactionLogTable extends Migration { Schema::create('transaction_log', function (Blueprint $table) { $table->increments('id'); - $table->string('ip'); - $table->string('username'); - $table->integer('trans_id'); - $table->integer('good_id'); - $table->integer('event'); + $table->string('ip'); + $table->string('username'); + $table->integer('trans_id'); + $table->integer('good_id'); + $table->integer('event'); $table->timestamps(); }); } diff --git a/database/migrations/2016_06_07_001722_create_transactions_table.php b/database/migrations/2016_06_07_001722_create_transactions_table.php index 962e366..91ef9e9 100644 --- a/database/migrations/2016_06_07_001722_create_transactions_table.php +++ b/database/migrations/2016_06_07_001722_create_transactions_table.php @@ -14,11 +14,11 @@ class CreateTransactionsTable extends Migration { Schema::create('transactions', function (Blueprint $table) { $table->increments('id'); - $table->integer('trans_id'); - $table->integer('buyer_id'); - $table->integer('seller_id'); - $table->integer('good_id'); - $table->integer('status'); + $table->integer('trans_id'); + $table->integer('buyer_id'); + $table->integer('seller_id'); + $table->integer('good_id'); + $table->integer('status'); $table->timestamps(); }); }