Skip to content

Commit 5fd6c9d

Browse files
frankslinfrankslin
committed
統一路由參數名稱以符合 Laravel 6
1 parent 6607416 commit 5fd6c9d

51 files changed

Lines changed: 202 additions & 118 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/Exceptions/Handler.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Exceptions;
44

5-
use Exception;
5+
use Throwable;
66
use Illuminate\Auth\AuthenticationException;
77
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
88

@@ -27,10 +27,10 @@ class Handler extends ExceptionHandler
2727
*
2828
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
2929
*
30-
* @param \Exception $exception
30+
* @param \Throwable $exception
3131
* @return void
3232
*/
33-
public function report(Exception $exception)
33+
public function report(Throwable $exception)
3434
{
3535
parent::report($exception);
3636
}
@@ -39,10 +39,10 @@ public function report(Exception $exception)
3939
* Render an exception into an HTTP response.
4040
*
4141
* @param \Illuminate\Http\Request $request
42-
* @param \Exception $exception
42+
* @param \Throwable $exception
4343
* @return \Illuminate\Http\Response
4444
*/
45-
public function render($request, Exception $exception)
45+
public function render($request, Throwable $exception)
4646
{
4747
return parent::render($request, $exception);
4848
}

‎app/Http/Controllers/BasicInformationAddressesController.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,10 @@ public function store(Request $request, $id)
9393
DB::table('BIOG_ADDR_DATA')->insert($data);
9494
$this->operationRepository->store(Auth::id(), $id, 1, 'BIOG_ADDR_DATA', $data['c_personid']."-".$data['c_addr_id']."-".$data['c_addr_type']."-".$data['c_sequence'], $data);
9595
flash('Store success @ '.Carbon::now(), 'success');
96-
return redirect()->route('basicinformation.addresses.edit', ['id' => $id, 'addr' => $data['c_personid']."-".$data['c_addr_id']."-".$data['c_addr_type']."-".$data['c_sequence']]);
96+
return redirect()->route('basicinformation.addresses.edit', [
97+
'basicinformation' => $id,
98+
'address' => $data['c_personid'].'-'.$data['c_addr_id'].'-'.$data['c_addr_type'].'-'.$data['c_sequence'],
99+
]);
97100
}
98101

99102
/**
@@ -242,7 +245,10 @@ public function update(Request $request, $id, $addr)
242245
$new_addr = $data['c_personid']."-".$data['c_addr_id']."-".$data['c_addr_type']."-".$data['c_sequence'];
243246
$this->operationRepository->store(Auth::id(), $id, 3, 'BIOG_ADDR_DATA', $new_addr, $data, $ori);
244247
flash('Update success @ '.Carbon::now(), 'success');
245-
return redirect()->route('basicinformation.addresses.edit', ['id' => $id, 'addr' => $new_addr]);
248+
return redirect()->route('basicinformation.addresses.edit', [
249+
'basicinformation' => $id,
250+
'address' => $new_addr,
251+
]);
246252
}
247253

248254
/**
@@ -282,6 +288,6 @@ public function destroy($id, $addr)
282288

283289
$this->operationRepository->store(Auth::id(), $id, 4, 'BIOG_ADDR_DATA', $addr, $row);
284290
flash('Delete success @ '.Carbon::now(), 'success');
285-
return redirect()->route('basicinformation.addresses.index', ['id' => $id]);
291+
return redirect()->route('basicinformation.addresses.index', ['basicinformation' => $id]);
286292
}
287293
}

‎app/Http/Controllers/BasicInformationAltnamesController.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,10 @@ public function store(Request $request, $id)
8989
flash('Store success @ '.Carbon::now(), 'success');
9090
//20200709引用聯合主鍵保留字弱點防禦函式
9191
$data['c_alt_name_chn'] = $this->biogMainRepository->unionPKDef($data['c_alt_name_chn']);
92-
return redirect()->route('basicinformation.altnames.edit', ['id' => $id, 'alt' => $data['c_personid']."-".$data['c_sequence']."-".$data['c_alt_name_chn']."-".$data['c_alt_name_type_code']]);
92+
return redirect()->route('basicinformation.altnames.edit', [
93+
'basicinformation' => $id,
94+
'altname' => $data['c_personid'].'-'.$data['c_sequence'].'-'.$data['c_alt_name_chn'].'-'.$data['c_alt_name_type_code'],
95+
]);
9396
}
9497

9598
/**
@@ -191,7 +194,10 @@ public function update(Request $request, $id, $alt)
191194
//20210715新增錯別字過濾
192195
$errWord = array('?', '', '�');
193196
$new_alt = str_replace($errWord, '', $new_alt);
194-
return redirect()->route('basicinformation.altnames.edit', ['id'=>$id, 'addr'=>$new_alt]);
197+
return redirect()->route('basicinformation.altnames.edit', [
198+
'basicinformation' => $id,
199+
'altname' => $new_alt,
200+
]);
195201
}
196202

197203
/**
@@ -233,6 +239,6 @@ public function destroy($id, $alt)
233239
['c_alt_name_type_code', '=', $addr_l[3]],
234240
])->delete();
235241
flash('Delete success @ '.Carbon::now(), 'success');
236-
return redirect()->route('basicinformation.altnames.index', ['id' => $id]);
242+
return redirect()->route('basicinformation.altnames.index', ['basicinformation' => $id]);
237243
}
238244
}

‎app/Http/Controllers/BasicInformationAssocController.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ public function store(Request $request, $id)
115115
flash('Store success @ '.Carbon::now(), 'success');
116116
//20200709引用聯合主鍵保留字弱點防禦函式
117117
$_id = $this->biogMainRepository->unionPKDef($_id);
118-
return redirect()->route('basicinformation.assoc.edit', ['id' => $id, '_id' => $_id]);
118+
return redirect()->route('basicinformation.assoc.edit', [
119+
'basicinformation' => $id,
120+
'assoc' => $_id,
121+
]);
119122
}
120123

121124
/**
@@ -187,7 +190,10 @@ public function update(Request $request, $id, $id_)
187190
flash('Update success @ '.Carbon::now(), 'success');
188191
//20200709引用聯合主鍵保留字弱點防禦函式
189192
$id_ = $this->biogMainRepository->unionPKDef($id_);
190-
return redirect()->route('basicinformation.assoc.edit', ['id'=>$id, 'id_'=>$id_]);
193+
return redirect()->route('basicinformation.assoc.edit', [
194+
'basicinformation' => $id,
195+
'assoc' => $id_,
196+
]);
191197
}
192198

193199
/**
@@ -208,6 +214,6 @@ public function destroy($id, $id_)
208214
}
209215
$this->biogMainRepository->assocDeleteById($id_, $id);
210216
flash('Delete success @ '.Carbon::now(), 'success');
211-
return redirect()->route('basicinformation.assoc.index', ['id' => $id]);
217+
return redirect()->route('basicinformation.assoc.index', ['basicinformation' => $id]);
212218
}
213219
}

‎app/Http/Controllers/BasicInformationEntriesController.php‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ public function store(Request $request, $id)
7474
/*
7575
$_id = $this->biogMainRepository->entryStoreById($request, $id);
7676
flash('Store success @ '.Carbon::now(), 'success');
77-
return redirect()->route('basicinformation.entries.edit', ['id' => $id, '_id' => $_id]);
77+
return redirect()->route('basicinformation.entries.edit', [
78+
'basicinformation' => $id,
79+
'entry' => $_id,
80+
]);
7881
*/
7982
$data = $request->all();
8083
$data = array_except($data, ['_token']);
@@ -125,7 +128,10 @@ public function store(Request $request, $id)
125128
$newKey = $data['c_personid'].'-'.$data['c_entry_code'].'-'.$data['c_sequence'].'-'.$data['c_kin_code'].'-'.$data['c_assoc_code'].'-'.$data['c_kin_id'].'-'.$data['c_year'].'-'.$data['c_assoc_id'].'-'.$data['c_inst_code'].'-'.$data['c_inst_name_code'];
126129
$this->operationRepository->store(Auth::id(), $id, 1, 'ENTRY_DATA', $newKey, $data);
127130
flash('Store success @ '.Carbon::now(), 'success');
128-
return redirect()->route('basicinformation.entries.edit', ['id' => $id, 'alt' => $newKey]);
131+
return redirect()->route('basicinformation.entries.edit', [
132+
'basicinformation' => $id,
133+
'entry' => $newKey,
134+
]);
129135
}
130136

131137
/**
@@ -180,7 +186,10 @@ public function update(Request $request, $id, $id_)
180186
//原本的寫法，保留做為參考。
181187
$this->biogMainRepository->entryUpdateById($request, $id_, $id);
182188
flash('Update success @ '.Carbon::now(), 'success');
183-
return redirect()->route('basicinformation.entries.edit', ['id'=>$id, 'id_'=>$id_]);
189+
return redirect()->route('basicinformation.entries.edit', [
190+
'basicinformation' => $id,
191+
'entry' => $id_,
192+
]);
184193
*/
185194
$data = $request->all();
186195
$data = array_except($data, ['_method', '_token']);
@@ -230,7 +239,10 @@ public function update(Request $request, $id, $id_)
230239
$newid = $id.'-'.$data['c_entry_code'].'-'.$data['c_sequence'].'-'.$data['c_kin_code'].'-'.$data['c_assoc_code'].'-'.$data['c_kin_id'].'-'.$data['c_year'].'-'.$data['c_assoc_id'].'-'.$data['c_inst_code'].'-'.$data['c_inst_name_code'];
231240
$this->operationRepository->store(Auth::id(), $id, 3, 'ENTRY_DATA', $newid, $data);
232241
flash('Update success @ '.Carbon::now(), 'success');
233-
return redirect()->route('basicinformation.entries.edit', ['id'=>$id, 'id_'=>$newid]);
242+
return redirect()->route('basicinformation.entries.edit', [
243+
'basicinformation' => $id,
244+
'entry' => $newid,
245+
]);
234246
}
235247

236248
/**
@@ -283,6 +295,6 @@ public function destroy($id, $id_)
283295
['c_inst_name_code', '=', $addr_a[9]],
284296
])->delete();
285297
flash('Delete success @ '.Carbon::now(), 'success');
286-
return redirect()->route('basicinformation.entries.index', ['id' => $id]);
298+
return redirect()->route('basicinformation.entries.index', ['basicinformation' => $id]);
287299
}
288300
}

‎app/Http/Controllers/BasicInformationEventsController.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ public function store(Request $request, $id)
6464
}
6565
$_id = $this->biogMainRepository->eventStoreById($request, $id);
6666
flash('Store success @ '.Carbon::now(), 'success');
67-
return redirect()->route('basicinformation.events.edit', ['id' => $id, '_id' => $_id]);
67+
return redirect()->route('basicinformation.events.edit', [
68+
'basicinformation' => $id,
69+
'event' => $_id,
70+
]);
6871
}
6972

7073
/**
@@ -113,7 +116,10 @@ public function update(Request $request, $id, $id_)
113116
}
114117
$_id = $this->biogMainRepository->eventUpdateById($request, $id, $id_);
115118
flash('Update success @ '.Carbon::now(), 'success');
116-
return redirect()->route('basicinformation.events.edit', ['id' => $id, '_id' => $_id]);
119+
return redirect()->route('basicinformation.events.edit', [
120+
'basicinformation' => $id,
121+
'event' => $_id,
122+
]);
117123
}
118124

119125
/**
@@ -134,6 +140,6 @@ public function destroy($id, $id_)
134140
}
135141
$this->biogMainRepository->eventDeleteById($id_, $id);
136142
flash('Delete success @ '.Carbon::now(), 'success');
137-
return redirect()->route('basicinformation.events.index', ['id' => $id]);
143+
return redirect()->route('basicinformation.events.index', ['basicinformation' => $id]);
138144
}
139145
}

‎app/Http/Controllers/BasicInformationKinshipController.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ public function store(Request $request, $id)
6666
$data = $this->biogMainRepository->kinshipStoreById($request, $id);
6767
$_id = $data['c_personid']."-".$data['c_kin_id']."-".$data['c_kin_code'];
6868
flash('Store success @ '.Carbon::now(), 'success');
69-
return redirect()->route('basicinformation.kinship.edit', ['id' => $id, '_id' => $_id]);
69+
return redirect()->route('basicinformation.kinship.edit', [
70+
'basicinformation' => $id,
71+
'kinship' => $_id,
72+
]);
7073
}
7174

7275
/**
@@ -123,7 +126,10 @@ public function update(Request $request, $id, $id_)
123126
}
124127
else {}
125128
flash('Update success @ '.Carbon::now(), 'success');
126-
return redirect()->route('basicinformation.kinship.edit', ['id'=>$id, 'id_'=>$id_]);
129+
return redirect()->route('basicinformation.kinship.edit', [
130+
'basicinformation' => $id,
131+
'kinship' => $id_,
132+
]);
127133
}
128134

129135
/**
@@ -144,6 +150,6 @@ public function destroy($id, $id_)
144150
}
145151
$this->biogMainRepository->kinshipDeleteById($id_, $id);
146152
flash('Delete success @ '.Carbon::now(), 'success');
147-
return redirect()->route('basicinformation.kinship.index', ['id' => $id]);
153+
return redirect()->route('basicinformation.kinship.index', ['basicinformation' => $id]);
148154
}
149155
}

‎app/Http/Controllers/BasicInformationOfficesController.php‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,10 @@ public function store(Request $request, $id)
100100
//修改結束
101101
$_id = $this->biogMainRepository->officeStoreById($request, $id);
102102
flash('Store success @ '.Carbon::now(), 'success');
103-
return redirect()->route('basicinformation.offices.edit', ['id' => $id, 'office' => $_id]);
103+
return redirect()->route('basicinformation.offices.edit', [
104+
'basicinformation' => $id,
105+
'office' => $_id,
106+
]);
104107
}
105108

106109
/**
@@ -177,7 +180,10 @@ public function update(Request $request, $id, $id_)
177180
flash('Update success @ '.Carbon::now(), 'success');
178181
}
179182

180-
return redirect()->route('basicinformation.offices.edit', ['id' => $id, 'office' => $officeKey]);
183+
return redirect()->route('basicinformation.offices.edit', [
184+
'basicinformation' => $id,
185+
'office' => $officeKey,
186+
]);
181187
}
182188

183189
//20190225新增另存功能
@@ -215,7 +221,10 @@ public function saveas($id, $cpk)
215221
(new OperationRepository())->store(Auth::id(), $id, 1, 'POSTED_TO_OFFICE_DATA', $data['c_posting_id'], $data);
216222
$_id = $data['c_office_id']."-".$data['c_posting_id'];
217223
flash('Store success @ '.Carbon::now(), 'success');
218-
return redirect()->route('basicinformation.offices.edit', ['id' => $id, 'office' => $_id]);
224+
return redirect()->route('basicinformation.offices.edit', [
225+
'basicinformation' => $id,
226+
'office' => $_id,
227+
]);
219228
}
220229

221230
public function insertAddr(Array $c_addr, $_id, $_postingid, $_officeid)
@@ -251,7 +260,7 @@ public function destroy($id, $office)
251260
}
252261
$this->biogMainRepository->officeDeleteById($office, $id);
253262
flash('Delete success @ '.Carbon::now(), 'success');
254-
return redirect()->route('basicinformation.offices.index', ['id' => $id]);
263+
return redirect()->route('basicinformation.offices.index', ['basicinformation' => $id]);
255264
}
256265

257266
/**

‎app/Http/Controllers/BasicInformationPossessionController.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ public function store(Request $request, $id)
6464
}
6565
$_id = $this->biogMainRepository->possessionStoreById($request, $id);
6666
flash('Store success @ '.Carbon::now(), 'success');
67-
return redirect()->route('basicinformation.possession.edit', ['id' => $id, '_id' => $_id]);
67+
return redirect()->route('basicinformation.possession.edit', [
68+
'basicinformation' => $id,
69+
'possession' => $_id,
70+
]);
6871

6972
}
7073

@@ -115,7 +118,10 @@ public function update(Request $request, $id, $id_)
115118
}
116119
$this->biogMainRepository->possessionUpdateById($request, $id, $id_);
117120
flash('Update success @ '.Carbon::now(), 'success');
118-
return redirect()->route('basicinformation.possession.edit', ['id'=>$id, 'id_'=>$id_]);
121+
return redirect()->route('basicinformation.possession.edit', [
122+
'basicinformation' => $id,
123+
'possession' => $id_,
124+
]);
119125
}
120126

121127
/**
@@ -136,6 +142,6 @@ public function destroy($id, $id_)
136142
}
137143
$this->biogMainRepository->possessionDeleteById($id_, $id);
138144
flash('Delete success @ '.Carbon::now(), 'success');
139-
return redirect()->route('basicinformation.possession.index', ['id' => $id]);
145+
return redirect()->route('basicinformation.possession.index', ['basicinformation' => $id]);
140146
}
141147
}

‎app/Http/Controllers/BasicInformationSocialInstController.php‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ public function store(Request $request, $id)
9191
//修改結束
9292
$_id = $this->biogMainRepository->socialInstStoreById($request, $id);
9393
flash('Store success @ '.Carbon::now(), 'success');
94-
return redirect()->route('basicinformation.socialinst.edit', ['id' => $id, '_id' => $_id]);
94+
return redirect()->route('basicinformation.socialinst.edit', [
95+
'basicinformation' => $id,
96+
'socialinst' => $_id,
97+
]);
9598
}
9699

97100
/**
@@ -142,7 +145,10 @@ public function update(Request $request, $id, $id_)
142145
//原本的寫法，保留做為參考。
143146
$this->biogMainRepository->socialInstUpdateById($request, $id_, $id);
144147
flash('Update success @ '.Carbon::now(), 'success');
145-
return redirect()->route('basicinformation.socialinst.edit', ['id'=>$id, 'id_'=>$id_]);
148+
return redirect()->route('basicinformation.socialinst.edit', [
149+
'basicinformation' => $id,
150+
'socialinst' => $id_,
151+
]);
146152
*/
147153

148154
$data = $request->all();
@@ -177,7 +183,10 @@ public function update(Request $request, $id, $id_)
177183
$newid = $id.'-'.$data['c_inst_code'].'-'.$data['c_inst_name_code'].'-'.$data['c_bi_role_code'];
178184
$this->operationRepository->store(Auth::id(), $id, 3, 'BIOG_INST_DATA', $newid, $data);
179185
flash('Update success @ '.Carbon::now(), 'success');
180-
return redirect()->route('basicinformation.socialinst.edit', ['id'=>$id, 'id_'=>$newid]);
186+
return redirect()->route('basicinformation.socialinst.edit', [
187+
'basicinformation' => $id,
188+
'socialinst' => $newid,
189+
]);
181190
}
182191

183192
/**
@@ -214,6 +223,6 @@ public function destroy($id, $id_)
214223
['c_bi_role_code', '=', $addr_l[3]],
215224
])->delete();
216225
flash('Delete success @ '.Carbon::now(), 'success');
217-
return redirect()->route('basicinformation.socialinst.index', ['id' => $id]);
226+
return redirect()->route('basicinformation.socialinst.index', ['basicinformation' => $id]);
218227
}
219228
}

0 commit comments

Comments
 (0)