diff --git a/Server/application/common/model/Administrator.php b/Server/application/common/model/Administrator.php index a30c66e3..28a6577d 100644 --- a/Server/application/common/model/Administrator.php +++ b/Server/application/common/model/Administrator.php @@ -20,6 +20,7 @@ class Administrator extends Model protected $createTime = 'createTime'; protected $updateTime = 'updateTime'; protected $deleteTime = 'deleteTime'; + protected $defaultSoftDelete = 0; // 隐藏字段 protected $hidden = [ diff --git a/Server/application/common/model/AdministratorPermissions.php b/Server/application/common/model/AdministratorPermissions.php index 48637acb..b516073d 100644 --- a/Server/application/common/model/AdministratorPermissions.php +++ b/Server/application/common/model/AdministratorPermissions.php @@ -19,4 +19,5 @@ class AdministratorPermissions extends Model protected $createTime = 'createTime'; protected $updateTime = 'updateTime'; protected $deleteTime = 'deleteTime'; + protected $defaultSoftDelete = 0; } \ No newline at end of file diff --git a/Server/application/common/model/Attachment.php b/Server/application/common/model/Attachment.php index c668217c..e0cebd3c 100644 --- a/Server/application/common/model/Attachment.php +++ b/Server/application/common/model/Attachment.php @@ -13,4 +13,5 @@ class Attachment extends Model protected $autoWriteTimestamp = true; protected $createTime = 'createTime'; protected $updateTime = 'updateTime'; + protected $defaultSoftDelete = 0; } \ No newline at end of file diff --git a/Server/application/common/model/Company.php b/Server/application/common/model/Company.php index 2c422e19..65fecd2b 100644 --- a/Server/application/common/model/Company.php +++ b/Server/application/common/model/Company.php @@ -19,4 +19,5 @@ class Company extends Model protected $createTime = 'createTime'; protected $updateTime = 'updateTime'; protected $deleteTime = 'deleteTime'; + protected $defaultSoftDelete = 0; } \ No newline at end of file diff --git a/Server/application/common/model/Device.php b/Server/application/common/model/Device.php index 84515878..191f6cdc 100644 --- a/Server/application/common/model/Device.php +++ b/Server/application/common/model/Device.php @@ -20,4 +20,5 @@ class Device extends Model protected $createTime = 'createTime'; protected $updateTime = 'updateTime'; protected $deleteTime = 'deleteTime'; + protected $defaultSoftDelete = 0; } \ No newline at end of file diff --git a/Server/application/common/model/User.php b/Server/application/common/model/User.php index b237def2..5d9b15b7 100644 --- a/Server/application/common/model/User.php +++ b/Server/application/common/model/User.php @@ -18,6 +18,7 @@ class User extends Model protected $autoWriteTimestamp = true; protected $createTime = 'createTime'; protected $updateTime = 'updateTime'; + protected $defaultSoftDelete = 0; /** * 主键 @@ -146,19 +147,4 @@ class User extends Model 'lastLoginTime' => $user->lastLoginTime ]; } - - /** - * 验证用户密码 - * @param string $password 密码 - * @param bool $isEncrypted 是否已加密 - * @return bool - */ - public function verifyPassword($password, $isEncrypted = false) - { - if ($isEncrypted) { - return hash_equals($this->passwordMd5, $password); - } else { - return $this->passwordMd5 === md5($password); - } - } } \ No newline at end of file diff --git a/Server/application/common/model/WechatAccount.php b/Server/application/common/model/WechatAccount.php index 6357dc26..5deae91f 100644 --- a/Server/application/common/model/WechatAccount.php +++ b/Server/application/common/model/WechatAccount.php @@ -16,5 +16,5 @@ class WechatAccount extends Model protected $autoWriteTimestamp = true; protected $createTime = 'createTime'; protected $updateTime = 'updateTime'; - + protected $defaultSoftDelete = 0; } \ No newline at end of file diff --git a/Server/application/common/model/WechatFriend.php b/Server/application/common/model/WechatFriend.php index 54319f3a..c2c5be77 100644 --- a/Server/application/common/model/WechatFriend.php +++ b/Server/application/common/model/WechatFriend.php @@ -16,4 +16,5 @@ class WechatFriend extends Model protected $autoWriteTimestamp = true; protected $createTime = 'createTime'; protected $updateTime = 'updateTime'; + protected $defaultSoftDelete = 0; } \ No newline at end of file diff --git a/Server/application/common/model/WechatTag.php b/Server/application/common/model/WechatTag.php index 93b49609..30bfc90b 100644 --- a/Server/application/common/model/WechatTag.php +++ b/Server/application/common/model/WechatTag.php @@ -16,4 +16,5 @@ class WechatTag extends Model protected $autoWriteTimestamp = true; protected $createTime = 'createTime'; protected $updateTime = 'updateTime'; + protected $defaultSoftDelete = 0; } \ No newline at end of file