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:
@@ -53,7 +53,7 @@ class Friend extends FrontendBase
|
||||
->select();
|
||||
$list = [];
|
||||
foreach ($friends as $f) {
|
||||
$u = Db::name('member')->where('uid', $f->fid)
|
||||
$u = Db::name('member_user')->where('uid', $f->fid)
|
||||
->field('uid,nickname,avatar,phone')->find();
|
||||
if ($u) {
|
||||
$u['friend_id'] = $f->id;
|
||||
@@ -76,7 +76,7 @@ class Friend extends FrontendBase
|
||||
->select();
|
||||
$list = [];
|
||||
foreach ($rows as $r) {
|
||||
$u = Db::name('member')->where('uid', $r->uid)
|
||||
$u = Db::name('member_user')->where('uid', $r->uid)
|
||||
->field('uid,nickname,avatar')->find();
|
||||
if ($u) {
|
||||
$u['friend_id'] = $r->id;
|
||||
@@ -151,7 +151,7 @@ class Friend extends FrontendBase
|
||||
if (! $row) {
|
||||
$this->error('好友不存在');
|
||||
}
|
||||
$u = Db::name('member')->where('uid', $row->fid)
|
||||
$u = Db::name('member_user')->where('uid', $row->fid)
|
||||
->field('uid,nickname,avatar,phone')->find();
|
||||
if ($u) {
|
||||
$u['friend_id'] = $row->id;
|
||||
|
||||
@@ -67,7 +67,7 @@ class Gift extends FrontendBase
|
||||
if (! $gift) {
|
||||
$this->error('礼物不存在');
|
||||
}
|
||||
$receiver = Db::name('member')->where('uid', $toUid)->value('uid');
|
||||
$receiver = Db::name('member_user')->where('uid', $toUid)->value('uid');
|
||||
if (! $receiver) {
|
||||
$this->error('接收用户不存在');
|
||||
}
|
||||
|
||||
@@ -65,9 +65,9 @@ class Login extends FrontendBase
|
||||
if (! $ret) {
|
||||
$this->error("验证码不正确!");
|
||||
}
|
||||
$user = Db::name('member')->where('mobile', $mobile)->where('status', '>=', 0)->find();
|
||||
$user = Db::name('member_user')->where('mobile', $mobile)->where('status', '>=', 0)->find();
|
||||
if (empty($user)) {
|
||||
$uid = Db::name('member')->insertGetId([
|
||||
$uid = Db::name('member_user')->insertGetId([
|
||||
'account' => $mobile,
|
||||
'mobile' => $mobile,
|
||||
'nickname' => $this->generateRandomNickname(),
|
||||
@@ -78,9 +78,9 @@ class Login extends FrontendBase
|
||||
'update_at' => time(),
|
||||
'update_ip' => Request::ip(),
|
||||
]);
|
||||
$user = Db::name('member')->find($uid);
|
||||
$user = Db::name('member_user')->find($uid);
|
||||
} else {
|
||||
Db::name('member')->where('uid', $user['uid'])->update([
|
||||
Db::name('member_user')->where('uid', $user['uid'])->update([
|
||||
'update_at' => time(),
|
||||
'update_ip' => Request::ip(),
|
||||
]);
|
||||
@@ -114,9 +114,9 @@ class Login extends FrontendBase
|
||||
}
|
||||
Cache::delete('wxchat_oneclick_' . $preToken);
|
||||
|
||||
$user = Db::name('member')->where('mobile', $phone)->where('status', '>=', 0)->find();
|
||||
$user = Db::name('member_user')->where('mobile', $phone)->where('status', '>=', 0)->find();
|
||||
if (empty($user)) {
|
||||
$uid = Db::name('member')->insertGetId([
|
||||
$uid = Db::name('member_user')->insertGetId([
|
||||
'account' => $phone,
|
||||
'mobile' => $phone,
|
||||
'nickname' => $this->generateRandomNickname(),
|
||||
@@ -127,9 +127,9 @@ class Login extends FrontendBase
|
||||
'update_at' => time(),
|
||||
'update_ip' => Request::ip(),
|
||||
]);
|
||||
$user = Db::name('member')->find($uid);
|
||||
$user = Db::name('member_user')->find($uid);
|
||||
} else {
|
||||
Db::name('member')->where('uid', $user['uid'])->update([
|
||||
Db::name('member_user')->where('uid', $user['uid'])->update([
|
||||
'update_at' => time(),
|
||||
'update_ip' => Request::ip(),
|
||||
]);
|
||||
@@ -167,7 +167,7 @@ class Login extends FrontendBase
|
||||
$phone = $tempData['phone'];
|
||||
|
||||
// 检查手机号是否已被注册
|
||||
$exists = Db::name('member')
|
||||
$exists = Db::name('member_user')
|
||||
->where('mobile', $phone)
|
||||
->where('status', 1)
|
||||
->find();
|
||||
@@ -196,7 +196,7 @@ class Login extends FrontendBase
|
||||
'update_ip' => Request::ip(),
|
||||
];
|
||||
|
||||
$userId = Db::name('member')->insertGetId($userData);
|
||||
$userId = Db::name('member_user')->insertGetId($userData);
|
||||
if (! $userId) {
|
||||
throw new \Exception('用户注册失败');
|
||||
}
|
||||
@@ -205,7 +205,7 @@ class Login extends FrontendBase
|
||||
$this->issueToken($userId);
|
||||
$this->logUserRegister($userId, $userData);
|
||||
|
||||
$user = Db::name('member')->find($userId);
|
||||
$user = Db::name('member_user')->find($userId);
|
||||
$this->success([
|
||||
'user_info' => $this->formatUserInfo($user),
|
||||
'is_registered' => true,
|
||||
|
||||
@@ -178,7 +178,7 @@ class Task extends FrontendBase
|
||||
->where('create_at', '>=', $today)
|
||||
->count();
|
||||
case 'profile':
|
||||
$user = Db::name('member')->where('uid', $uid)->field('nickname,avatar')->find();
|
||||
$user = Db::name('member_user')->where('uid', $uid)->field('nickname,avatar')->find();
|
||||
$profile = Db::name('member_profile')->where('uid', $uid)
|
||||
->field('bio,birthday,gender')->find();
|
||||
$score = 0;
|
||||
|
||||
@@ -58,7 +58,7 @@ class Member extends FrontendBase
|
||||
if (! $profile) {
|
||||
$this->error('用户不存在');
|
||||
}
|
||||
$user = Db::name('member')->where('uid', $targetUid)
|
||||
$user = Db::name('member_user')->where('uid', $targetUid)
|
||||
->field('uid,nickname,avatar,account,status')->find();
|
||||
|
||||
$pc = ! empty($profile->privacy_config) ? json_decode($profile->privacy_config, true) : [];
|
||||
@@ -538,7 +538,7 @@ class Member extends FrontendBase
|
||||
$limit = 50;
|
||||
|
||||
if ($type == 'rich') {
|
||||
$list = Db::name('member_wallets')->alias('w')
|
||||
$list = Db::name('member_wallet')->alias('w')
|
||||
->join('user u', 'u.uid = w.uid')
|
||||
->order('w.coins', 'desc')
|
||||
->limit($limit)
|
||||
@@ -578,7 +578,7 @@ class Member extends FrontendBase
|
||||
public function wallet()
|
||||
{
|
||||
$uid = $this->uid;
|
||||
$row = Db::name('member_wallets')->where('uid', $uid)->find();
|
||||
$row = Db::name('member_wallet')->where('uid', $uid)->find();
|
||||
if (empty($row)) {
|
||||
$row = [
|
||||
'balance' => '0.00',
|
||||
|
||||
@@ -23,7 +23,7 @@ return [
|
||||
'intro' => '',
|
||||
'author' => '',
|
||||
'website' => '',
|
||||
'version' => '1.0.1',
|
||||
'version' => '1.0.2',
|
||||
'state' => 0,
|
||||
'url' => '/wxchat',
|
||||
'license' => '',
|
||||
|
||||
Reference in New Issue
Block a user