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,7 +10,7 @@ declare(strict_types=1);
|
||||
|
||||
namespace app\member\controller;
|
||||
|
||||
use ywxapp\model\Medal as MedalModel;
|
||||
use ywxapp\model\CommonMedal as MedalModel;
|
||||
use ywxapp\controller\MemberBase;
|
||||
|
||||
/**
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace app\member\controller;
|
||||
use think\Request;
|
||||
use ywxapp\service\FileStorageService;
|
||||
use ywxapp\model\MemberProfile;
|
||||
use ywxapp\model\Medal;
|
||||
use ywxapp\model\CommonMedal;
|
||||
use app\member\validate\Profile as ProfileValidate;
|
||||
|
||||
use ywxapp\controller\MemberBase;
|
||||
@@ -52,7 +52,7 @@ class Profile extends MemberBase
|
||||
$user = $this->auth->model;
|
||||
$this->view->assign('info', $user);
|
||||
$this->view->assign('profile', $user->profile ?? new MemberProfile());
|
||||
$this->view->assign('medals', Medal::getUserMedals((int) $user->uid));
|
||||
$this->view->assign('medals', CommonMedal::getUserMedals((int) $user->uid));
|
||||
|
||||
return $this->view->fetch();
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ use think\facade\Event;
|
||||
use think\Request;
|
||||
use ywxapp\controller\MemberBase;
|
||||
use ywxapp\library\Sms;
|
||||
use ywxapp\model\Sms as SmsModel;
|
||||
use ywxapp\model\CommonSms as SmsModel;
|
||||
use ywxapp\model\MemberUser as UserModel;
|
||||
use ywxapp\model\MemberProfile;
|
||||
use ywxapp\model\MemberGroupAccess;
|
||||
|
||||
@@ -95,13 +95,13 @@ class Task extends MemberBase
|
||||
public function myPropList()
|
||||
{
|
||||
$uid = (int) ($this->auth->model->uid ?? 0);
|
||||
\ywxapp\model\Task::ensureSchema(); // 确保 user_prop 关联表已就绪
|
||||
\ywxapp\model\CommonTask::ensureSchema(); // 确保 user_prop 关联表已就绪
|
||||
if ($uid <= 0) {
|
||||
$this->result->error('请先登录');
|
||||
}
|
||||
$list = Db::name('member_prop')
|
||||
->alias('up')
|
||||
->join('prop p', 'p.id = up.prop_id', 'left')
|
||||
->join('common_prop p', 'p.id = up.prop_id', 'left')
|
||||
->where('up.uid', $uid)
|
||||
->field('up.id, up.prop_id, up.num, up.create_at, p.title, p.icon')
|
||||
->order('up.create_at', 'desc')
|
||||
|
||||
@@ -51,7 +51,7 @@ class UserMemberActivate
|
||||
$level = (int)($plan['level'] ?? 0);
|
||||
$gid = (int)($plan['gid'] ?? 0);
|
||||
|
||||
$user = Db::name('member')->where('uid', $uid)->find();
|
||||
$user = Db::name('member_user')->where('uid', $uid)->find();
|
||||
if (empty($user)) {
|
||||
Log::warning('[UserMemberActivate] 用户不存在 uid=' . $uid);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user