Merge branch 'master' into master

wmhello · web-flow · commit b627c134d338 · 2018-02-25T22:30:39.000-06:00
diff --git a/back.md b/back.md
@@ -12,13 +12,11 @@
    
 `php artisan passport:install --force`
 
-## 5、复制第4步生成的密钥到.env文件中，填写为PERSONAL_Client_Secret和PASSPORT_Client_Secret的参数
+## 5、复制第4步生成的密钥到.env文件中，填写为PERSONAL_CLIENT_SECRET和PASSPORT_CLIENT_SECRET的参数
 PERSONAL_CLIENT_ID=1
-
 PERSONAL_CLIENT_SECRET=
 
 PASSPORT_CLIENT_ID=2
-
 PASSPORT_CLIENT_SECRET=
 
 ## 6、生成用户数据和各种结构数据
diff --git a/backend/.env.example b/backend/.env.example
@@ -32,8 +32,8 @@ PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 
-PERSONAL_Client_ID=1
-PERSONAL_Client_Secret=
+PERSONAL_CLIENT_ID=1
+PERSONAL_CLIENT_SECRET=
 
-PASSPORT_Client_ID=2
-PASSPORT_Client_Secret=
+PASSPORT_CLIENT_ID=2
+PASSPORT_CLIENT_SECRET=
diff --git a/backend/database/migrations/2018_02_24_140731_create_teachers_table.php b/backend/database/migrations/2018_02_24_140731_create_teachers_table.php
@@ -30,12 +30,12 @@ public function up()
             $table->unsignedTinyInteger('state')->comment('人员状态(1->正常 2->调出 3->退出 4->停薪留职)')->default(1);
             $table->unsignedTinyInteger('teaching_id')->comment('教学科目Id')->nullable;
             $table->timestamps();
-            $table->comment('教职工信息表');
             $table->unique('card_id');
             $table->unique('phone');
             $table->unique('phone2');
-            $table->foreign('teaching_id')->reference('id')->on('yz_teaching');
-            $table->foreign('nation_id')->reference('id')->on('yz_nation');
+            // 要设置外键的话  必须先保证相应的表格先存在
+            // $table->foreign('teaching_id')->reference('id')->on('yz_teaching');
+            // $table->foreign('nation_id')->reference('id')->on('yz_nation');
         });
     }
 
diff --git a/backend/database/seeds/DatabaseSeeder.php b/backend/database/seeds/DatabaseSeeder.php
@@ -14,5 +14,6 @@ public function run()
         $this->call(UsersTableSeeder::class);
         $this->call(RolesTableSeeder::class);
         $this->call(SessionsTableSeeder::class);
+        $this->call(PermissionsTableSeeder::class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,6 @@ public function run()`
`14`	`14`	`$this->call(UsersTableSeeder::class);`
`15`	`15`	`$this->call(RolesTableSeeder::class);`
`16`	`16`	`$this->call(SessionsTableSeeder::class);`
	`17`	`+ $this->call(PermissionsTableSeeder::class);`
`17`	`18`	`}`
`18`	`19`	`}`