mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

!385 基于PHP7.1版本使用Catch多个语句 

Merge pull request !385 from Henry/optimiza-exception-handle
pull/390/MERGE
F4nniu 2022-04-02 09:13:44 +00:00 committed by Gitee
parent a4617c7f28 2a97c21c0c
commit 9116b86a36
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
application/admin/library/traits/Backend.php
View File

@ -110,13 +110,7 @@ trait Backend
} }
$result = $this->model->allowField(true)->save($params); $result = $this->model->allowField(true)->save($params);
Db::commit(); Db::commit();
} catch (ValidateException $e) { } catch (ValidateException|PDOException|Exception $e) {
Db::rollback();
$this->error($e->getMessage());
} catch (PDOException $e) {
Db::rollback();
$this->error($e->getMessage());
} catch (Exception $e) {
Db::rollback(); Db::rollback();
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
@ -161,13 +155,7 @@ trait Backend
} }
$result = $row->allowField(true)->save($params); $result = $row->allowField(true)->save($params);
Db::commit(); Db::commit();
} catch (ValidateException $e) { } catch (ValidateException|PDOException|Exception $e) {
Db::rollback();
$this->error($e->getMessage());
} catch (PDOException $e) {
Db::rollback();
$this->error($e->getMessage());
} catch (Exception $e) {
Db::rollback(); Db::rollback();
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
@ -207,10 +195,7 @@ trait Backend
$count += $v->delete(); $count += $v->delete();
} }
Db::commit(); Db::commit();
} catch (PDOException $e) { } catch (PDOException|Exception $e) {
Db::rollback();
$this->error($e->getMessage());
} catch (Exception $e) {
Db::rollback(); Db::rollback();
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
@ -248,10 +233,7 @@ trait Backend
$count += $v->delete(true); $count += $v->delete(true);
} }
Db::commit(); Db::commit();
} catch (PDOException $e) { } catch (PDOException|Exception $e) {
Db::rollback();
$this->error($e->getMessage());
} catch (Exception $e) {
Db::rollback(); Db::rollback();
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
@ -288,10 +270,7 @@ trait Backend
$count += $item->restore(); $count += $item->restore();
} }
Db::commit(); Db::commit();
} catch (PDOException $e) { } catch (PDOException|Exception $e) {
Db::rollback();
$this->error($e->getMessage());
} catch (Exception $e) {
Db::rollback(); Db::rollback();
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
@ -327,10 +306,7 @@ trait Backend
$count += $item->allowField(true)->isUpdate(true)->save($values); $count += $item->allowField(true)->isUpdate(true)->save($values);
} }
Db::commit(); Db::commit();
} catch (PDOException $e) { } catch (PDOException|Exception $e) {
Db::rollback();
$this->error($e->getMessage());
} catch (Exception $e) {
Db::rollback(); Db::rollback();
$this->error($e->getMessage()); $this->error($e->getMessage());
} }