Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b627c13

Browse filesBrowse files
authored
Merge branch 'master' into master
2 parents ac5cd87 + 7553212 commit b627c13
Copy full SHA for b627c13

File tree

Expand file treeCollapse file tree

4 files changed

+9
-10
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+9
-10
lines changed

‎back.md

Copy file name to clipboardExpand all lines: back.md
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212

1313
`php artisan passport:install --force`
1414

15-
## 5、复制第4步生成的密钥到.env文件中,填写为PERSONAL_Client_Secret和PASSPORT_Client_Secret的参数
15+
## 5、复制第4步生成的密钥到.env文件中,填写为PERSONAL_CLIENT_SECRET和PASSPORT_CLIENT_SECRET的参数
1616
PERSONAL_CLIENT_ID=1
17-
1817
PERSONAL_CLIENT_SECRET=
1918

2019
PASSPORT_CLIENT_ID=2
21-
2220
PASSPORT_CLIENT_SECRET=
2321

2422
## 6、生成用户数据和各种结构数据

‎backend/.env.example

Copy file name to clipboardExpand all lines: backend/.env.example
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ PUSHER_APP_ID=
3232
PUSHER_APP_KEY=
3333
PUSHER_APP_SECRET=
3434

35-
PERSONAL_Client_ID=1
36-
PERSONAL_Client_Secret=
35+
PERSONAL_CLIENT_ID=1
36+
PERSONAL_CLIENT_SECRET=
3737

38-
PASSPORT_Client_ID=2
39-
PASSPORT_Client_Secret=
38+
PASSPORT_CLIENT_ID=2
39+
PASSPORT_CLIENT_SECRET=

‎backend/database/migrations/2018_02_24_140731_create_teachers_table.php

Copy file name to clipboardExpand all lines: backend/database/migrations/2018_02_24_140731_create_teachers_table.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public function up()
3030
$table->unsignedTinyInteger('state')->comment('人员状态(1->正常 2->调出 3->退出 4->停薪留职)')->default(1);
3131
$table->unsignedTinyInteger('teaching_id')->comment('教学科目Id')->nullable;
3232
$table->timestamps();
33-
$table->comment('教职工信息表');
3433
$table->unique('card_id');
3534
$table->unique('phone');
3635
$table->unique('phone2');
37-
$table->foreign('teaching_id')->reference('id')->on('yz_teaching');
38-
$table->foreign('nation_id')->reference('id')->on('yz_nation');
36+
// 要设置外键的话 必须先保证相应的表格先存在
37+
// $table->foreign('teaching_id')->reference('id')->on('yz_teaching');
38+
// $table->foreign('nation_id')->reference('id')->on('yz_nation');
3939
});
4040
}
4141

‎backend/database/seeds/DatabaseSeeder.php

Copy file name to clipboardExpand all lines: backend/database/seeds/DatabaseSeeder.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ public function run()
1414
$this->call(UsersTableSeeder::class);
1515
$this->call(RolesTableSeeder::class);
1616
$this->call(SessionsTableSeeder::class);
17+
$this->call(PermissionsTableSeeder::class);
1718
}
1819
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.