feat: 公共表更名 common/member 前缀 + 插件命令自动加载 + 版本 1.1.1
- 18 张公共表更名(addon/attachment/configure/links/spider_log/spider_stat/sms/notice/ad/task/prop/medal/help/card -> common_*,member_wallets->member_wallet,score_rule/score_log -> member_*,addon_config->common_addonconf),模型全部对齐新表名,Db 直引用清零 - Attachment 模型补 表名绑定,修复富文本上传查 wxapp_attachment 1146 隐患 - install.sql + 迁移 SQL:backend_admin/backend_role delete_at 默认 0,修复软删除(NULL != 0)误过滤导致后台菜单为空 - AppService::boot() 支持插件 info.php 声明 commands 自动注册插件命令(psr-4 自动加载,坏类名自动跳过) - 各插件(haonav/mqttbroker/wxchat/articles/blog/forum 等)字段与配置同步调整 - 框架版本 1.1.0 -> 1.1.1
This commit is contained in:
+10
-21
@@ -26,7 +26,6 @@ class MemberUser extends BaseModel
|
||||
{
|
||||
return [
|
||||
'strict' => true,
|
||||
'name' => 'member_user',
|
||||
'autoWriteTimestamp' => 'int',
|
||||
'readonly' => ['uid'],
|
||||
'createTime' => 'create_at',
|
||||
@@ -82,31 +81,21 @@ class MemberUser extends BaseModel
|
||||
->column('rid');
|
||||
}
|
||||
|
||||
// 密码加密
|
||||
|
||||
// 密码加密:bcrypt 自带盐,无需独立 salt 列
|
||||
// 兼容旧账户(若库里是 password_hash(value.salt) 的老哈希,
|
||||
// 这里统一改为 password_hash(value),老账户需要先重置密码)。
|
||||
public function setPasswordAttr($value)
|
||||
{
|
||||
$this->salt = $this->generateSalt();
|
||||
return password_hash($value . $this->salt, PASSWORD_DEFAULT);
|
||||
return password_hash($value, PASSWORD_DEFAULT);
|
||||
}
|
||||
|
||||
// 生成随机盐
|
||||
|
||||
protected function generateSalt($length = 6)
|
||||
{
|
||||
$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_[]{}<>~`+=,.;:/?|';
|
||||
$salt = '';
|
||||
for ($i = 0; $i < $length; $i++) {
|
||||
$salt .= $chars[mt_rand(0, strlen($chars) - 1)];
|
||||
}
|
||||
return $salt;
|
||||
}
|
||||
|
||||
// 验证密码
|
||||
|
||||
// 验证密码:bcrypt 哈希内已含盐,直接验证即可
|
||||
public function checkPassword($password)
|
||||
{
|
||||
return password_verify($password . $this->salt, $this->password);
|
||||
if (empty($this->password)) {
|
||||
return false;
|
||||
}
|
||||
return password_verify($password, $this->password);
|
||||
}
|
||||
|
||||
// 获取状态文本
|
||||
@@ -194,7 +183,7 @@ class MemberUser extends BaseModel
|
||||
public static function ensureSchema(): void
|
||||
{
|
||||
$prefix = BaseModel::currentPrefix();
|
||||
foreach (['member', 'member_bill', 'member_group', 'member_group_access', 'member_group_rule', 'member_log', 'member_profile', 'member_rule', 'member_wallets'] as $t) {
|
||||
foreach (['member_user', 'member_bill', 'member_group', 'member_group_access', 'member_group_rule', 'member_log', 'member_profile', 'member_rule', 'member_wallet'] as $t) {
|
||||
BaseModel::ensureTableFromInstall($prefix, $t);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user