From 25a87fe4e8986ecb56647296ccb7a59a74220975 Mon Sep 17 00:00:00 2001 From: catsworld <519418441@qq.com> Date: Tue, 7 Jun 2016 00:27:10 +0800 Subject: [PATCH] Temporarily finish the migrations and models so that our works on controllers can be going on. --- app/{transId.php => AuthLog.php} | 4 +-- app/Http/routes.php | 2 ++ app/Message.php | 10 ++++++ app/{tags.php => Tag.php} | 4 +-- app/Transaction.php | 10 ++++++ app/TransactionLog.php | 10 ++++++ app/User.php | 18 +--------- app/UserInfo.php | 10 ++++++ .../2014_10_12_000000_create_users_table.php | 10 ++++-- ...6_03_28_222053_create_user_info_table.php} | 13 ++++--- ...016_06_07_001111_create_messages_table.php | 35 +++++++++++++++++++ ...016_06_07_001341_create_auth_log_table.php | 33 +++++++++++++++++ ...07_001559_create_transaction_log_table.php | 35 +++++++++++++++++++ ...06_07_001722_create_transactions_table.php | 35 +++++++++++++++++++ 14 files changed, 198 insertions(+), 31 deletions(-) rename app/{transId.php => AuthLog.php} (52%) create mode 100644 app/Message.php rename app/{tags.php => Tag.php} (56%) create mode 100644 app/Transaction.php create mode 100644 app/TransactionLog.php create mode 100644 app/UserInfo.php rename database/migrations/{2016_03_28_222053_create_userinfo_table.php => 2016_03_28_222053_create_user_info_table.php} (68%) create mode 100644 database/migrations/2016_06_07_001111_create_messages_table.php create mode 100644 database/migrations/2016_06_07_001341_create_auth_log_table.php create mode 100644 database/migrations/2016_06_07_001559_create_transaction_log_table.php create mode 100644 database/migrations/2016_06_07_001722_create_transactions_table.php diff --git a/app/transId.php b/app/AuthLog.php similarity index 52% rename from app/transId.php rename to app/AuthLog.php index 8c059ce..792fe05 100644 --- a/app/transId.php +++ b/app/AuthLog.php @@ -4,7 +4,7 @@ namespace App; use Illuminate\Database\Eloquent\Model; -class transId extends Model +class AuthLog extends Model { - // + protected $table='auth_log'; } diff --git a/app/Http/routes.php b/app/Http/routes.php index a7c5159..3b040b4 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -29,3 +29,5 @@ Route::get('/', function () { Route::group(['middleware' => ['web']], function () { // }); + +Route::get('/good', 'GoodController@getList'); \ No newline at end of file diff --git a/app/Message.php b/app/Message.php new file mode 100644 index 0000000..51631d8 --- /dev/null +++ b/app/Message.php @@ -0,0 +1,10 @@ +increments('id'); - $table->string('name'); - $table->string('email')->unique(); + $table->integer('priviledge'); + $table->string('username')->unique(); $table->string('password'); - $table->rememberToken(); + $table->string('stuid'); + $table->string('SSO'); + $table->string('nickname'); + $table->string('email')->unique(); + $table->integer('role_id'); $table->timestamps(); }); } diff --git a/database/migrations/2016_03_28_222053_create_userinfo_table.php b/database/migrations/2016_03_28_222053_create_user_info_table.php similarity index 68% rename from database/migrations/2016_03_28_222053_create_userinfo_table.php rename to database/migrations/2016_03_28_222053_create_user_info_table.php index 2b6a05c..652d356 100644 --- a/database/migrations/2016_03_28_222053_create_userinfo_table.php +++ b/database/migrations/2016_03_28_222053_create_user_info_table.php @@ -12,15 +12,14 @@ class CreateUserinfoTable extends Migration */ public function up() { - Schema::create('userinfo', function (Blueprint $table) { + Schema::create('user_info', function (Blueprint $table) { $table->increments('id'); - $table->integer('stuid'); - $table->string('realname'); $table->string('gender'); + $table->string('realname'); + $table->string('tel_num'); $table->string('address'); - $table->string('birthday'); - $table->string('mail'); - $table->string('phonenumber'); + $table->string('last_login_ip'); + $table->string('register_ip'); $table->timestamps(); }); } @@ -31,6 +30,6 @@ class CreateUserinfoTable extends Migration */ public function down() { - Schema::drop('userinfo'); + Schema::drop('user_info'); } } diff --git a/database/migrations/2016_06_07_001111_create_messages_table.php b/database/migrations/2016_06_07_001111_create_messages_table.php new file mode 100644 index 0000000..5ebba95 --- /dev/null +++ b/database/migrations/2016_06_07_001111_create_messages_table.php @@ -0,0 +1,35 @@ +increments('message_id'); + $table->integer('cat_id'); + $table->integer('user_id'); + $table->integer('good_id'); + $table->integer('shop_id'); + $table->string('content'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('messages'); + } +} 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 new file mode 100644 index 0000000..614fa7e --- /dev/null +++ b/database/migrations/2016_06_07_001341_create_auth_log_table.php @@ -0,0 +1,33 @@ +increments('id'); + $table->string('ip'); + $table->string('username'); + $table->integer('event'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('auth_log'); + } +} 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 new file mode 100644 index 0000000..ebe5f82 --- /dev/null +++ b/database/migrations/2016_06_07_001559_create_transaction_log_table.php @@ -0,0 +1,35 @@ +increments('id'); + $table->string('ip'); + $table->string('username'); + $table->integer('trans_id'); + $table->integer('good_id'); + $table->integer('event'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('transaction_log'); + } +} diff --git a/database/migrations/2016_06_07_001722_create_transactions_table.php b/database/migrations/2016_06_07_001722_create_transactions_table.php new file mode 100644 index 0000000..962e366 --- /dev/null +++ b/database/migrations/2016_06_07_001722_create_transactions_table.php @@ -0,0 +1,35 @@ +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'); + } +}