Skip to content

Commit 5ae1b48

Browse files
modstartmodstart
committed
新增：富文本编辑器迷你版增加 markdown 内容导入功能
1 parent 0490328 commit 5ae1b48

139 files changed

Lines changed: 1511 additions & 222 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/Constant/AppConstant.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ class AppConstant
66
{
77
const APP = 'cms9';
88
const APP_NAME = 'ModStartCMS9';
9-
const VERSION = '8.0.0';
9+
const VERSION = '8.1.0';
1010
}

‎module/Cms/Docs/release.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 3.7.0
1+
## 3.7.0 列表自定义字段过滤，点赞功能，备份优化等
22

33
- 新增：内容匿名点赞接口和点赞功能
44
- 新增：自定义字段增加「访客列表页面可见」属性，可控制列表字段显示

‎module/Member/Admin/Controller/MemberCreditController.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66

77
use Illuminate\Routing\Controller;
8+
use ModStart\Admin\Auth\Admin;
89
use ModStart\Admin\Auth\AdminPermission;
910
use ModStart\Admin\Layout\AdminDialogPage;
1011
use ModStart\Core\Dao\ModelUtil;
@@ -32,7 +33,9 @@ public function charge(AdminDialogPage $page)
3233
AdminPermission::demoCheck();
3334
$data = $form->dataForming();
3435
ModelUtil::transactionBegin();
35-
MemberCreditUtil::change($memberUserId, $data['change'], $data['remark']);
36+
MemberCreditUtil::change($memberUserId, $data['change'], $data['remark'], [
37+
'adminUserId' => Admin::id(),
38+
]);
3639
ModelUtil::transactionCommit();
3740
return Response::redirect(CRUDUtil::jsDialogCloseAndParentRefresh());
3841
});

‎module/Member/Admin/Controller/MemberCreditLogController.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Illuminate\Routing\Controller;
88
use ModStart\Admin\Concern\HasAdminQuickCRUD;
99
use ModStart\Admin\Layout\AdminCRUDBuilder;
10+
use ModStart\Core\Util\SerializeUtil;
1011
use ModStart\Field\AbstractField;
1112
use ModStart\Field\AutoRenderedFieldValue;
1213
use ModStart\Grid\GridFilter;
@@ -36,6 +37,18 @@ protected function crud(AdminCRUDBuilder $builder)
3637
);
3738
});
3839
$builder->text('remark', '备注');
40+
$builder->display('meta', '其他信息')
41+
->hookRendering(function (AbstractField $field, $item, $index) {
42+
$meta = SerializeUtil::jsonDecode($item->meta);
43+
$html = [];
44+
if (isset($meta['freezeId'])) {
45+
$html[] = '<span class="ub-text-muted">冻结-提交(ID=' . $meta['freezeId'] . ')</span>';
46+
}
47+
if (isset($meta['adminUserId'])) {
48+
$html[] = '<span class="ub-text-muted">操作管理员(ID=' . $meta['adminUserId'] . ')</span>';
49+
}
50+
return AutoRenderedFieldValue::make(join('', $html));
51+
});
3952
$builder->display('created_at', L('Created At'));
4053
})
4154
->gridFilter(function (GridFilter $filter) {

‎module/Member/Admin/Controller/MemberMoneyController.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66

77
use Illuminate\Routing\Controller;
8+
use ModStart\Admin\Auth\Admin;
89
use ModStart\Admin\Auth\AdminPermission;
910
use ModStart\Admin\Layout\AdminDialogPage;
1011
use ModStart\Core\Dao\ModelUtil;
@@ -32,7 +33,9 @@ public function charge(AdminDialogPage $page)
3233
AdminPermission::demoCheck();
3334
$data = $form->dataForming();
3435
ModelUtil::transactionBegin();
35-
MemberMoneyUtil::change($memberUserId, $data['change'], $data['remark']);
36+
MemberMoneyUtil::change($memberUserId, $data['change'], $data['remark'], [
37+
'adminUserId' => Admin::id(),
38+
]);
3639
ModelUtil::transactionCommit();
3740
return Response::redirect(CRUDUtil::jsDialogCloseAndParentRefresh());
3841
});

‎module/Member/Admin/Controller/MemberMoneyLogController.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Illuminate\Routing\Controller;
88
use ModStart\Admin\Concern\HasAdminQuickCRUD;
99
use ModStart\Admin\Layout\AdminCRUDBuilder;
10+
use ModStart\Core\Util\SerializeUtil;
1011
use ModStart\Field\AbstractField;
1112
use ModStart\Field\AutoRenderedFieldValue;
1213
use ModStart\Grid\GridFilter;
@@ -36,6 +37,15 @@ protected function crud(AdminCRUDBuilder $builder)
3637
);
3738
});
3839
$builder->text('remark', '备注');
40+
$builder->display('meta', '其他信息')
41+
->hookRendering(function (AbstractField $field, $item, $index) {
42+
$meta = SerializeUtil::jsonDecode($item->meta);
43+
$html = [];
44+
if (isset($meta['adminUserId'])) {
45+
$html[] = '<span class="ub-text-muted">操作管理员(ID=' . $meta['adminUserId'] . ')</span>';
46+
}
47+
return AutoRenderedFieldValue::make(join('', $html));
48+
});
3949
$builder->display('created_at', L('Created At'));
4050
})
4151
->gridFilter(function (GridFilter $filter) {

‎module/Member/Api/Controller/AuthController.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
use Illuminate\Support\Facades\Log;
77
use Illuminate\Support\Facades\Session;
88
use Illuminate\Support\Str;
9+
use ModStart\Core\Assets\AssetsUtil;
910
use ModStart\Core\Exception\BizException;
1011
use ModStart\Core\Input\InputPackage;
1112
use ModStart\Core\Input\Request;
1213
use ModStart\Core\Input\Response;
1314
use ModStart\Core\Util\CurlUtil;
1415
use ModStart\Core\Util\EventUtil;
16+
use ModStart\Core\Util\RandomUtil;
1517
use ModStart\Core\Util\StrUtil;
1618
use ModStart\Misc\Captcha\CaptchaFacade;
1719
use ModStart\Module\ModuleBaseController;
@@ -426,10 +428,13 @@ public function oauthCallback($oauthType = null, $callback = null)
426428
return Response::generateSuccess();
427429
}
428430
}
429-
431+
if (empty($userInfo['username'])) {
432+
$userInfo['username'] = modstart_config('Member_RegisterUsernameSuggest', '用户') . RandomUtil::hexString(6);
433+
}
430434
Session::put('oauthUserInfo', $userInfo);
431435
return Response::generate(0, 'ok', [
432436
'user' => $userInfo,
437+
'avatarEmpty' => AssetsUtil::fixFull('asset/image/avatar.svg'),
433438
]);
434439
}
435440

@@ -456,7 +461,7 @@ public function oauthLogin($oauthType = null, $callback = null)
456461
$ret = $oauth->processRedirect($param);
457462
BizException::throwsIfResponseError($ret);
458463
return Response::generate(0, 'ok', [
459-
'redirect' => $ret['data']['redirect'],
464+
'redirect' => isset($ret['data']['redirect']) ? $ret['data']['redirect'] : null,
460465
]);
461466
}
462467

‎module/Member/Api/Controller/MemberDataController.php‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,17 @@ public function fileManager($category)
3131
$category,
3232
'member_upload',
3333
'member_upload_category',
34-
MemberUser::id()
34+
MemberUser::id(),
35+
null,
36+
null,
37+
[
38+
'eventOpt' => [
39+
'param' => [
40+
'userType' => 'member',
41+
'userId' => MemberUser::id(),
42+
]
43+
]
44+
]
3545
);
3646
}
3747
}

‎module/Member/Api/Controller/MemberProfileController.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use Module\Vendor\Job\SmsSendJob;
2626
use Module\Vendor\Sms\SmsUtil;
2727
use Module\Vendor\Support\ResponseCodes;
28+
use Symfony\Component\HttpFoundation\File\UploadedFile;
2829

2930
/**
3031
* Class MemberProfileController
@@ -88,6 +89,20 @@ public function avatar()
8889
return Response::generate(-1, '头像内容为空');
8990
}
9091
switch ($input->getTrimString('type')) {
92+
case 'file':
93+
/** @var UploadedFile $avatarFile */
94+
$avatarFile = Input::file('avatar');
95+
BizException::throwsIfEmpty('头像文件为空', $avatarFile);
96+
$ext = FileUtil::mimeToExt($avatarFile->getClientMimeType());
97+
BizException::throwsIf('头像格式不合法', !in_array($ext, ['jpg', 'png', 'jpeg']));
98+
$content = file_get_contents($avatarFile->getRealPath());
99+
BizException::throwsIfEmpty('头像内容为空', $content);
100+
$ret = MemberUtil::setAvatar(MemberUser::id(), $content, $ext);
101+
if ($ret['code']) {
102+
return $ret;
103+
}
104+
EventUtil::fire(new MemberUserUpdatedEvent(MemberUser::id(), 'avatar'));
105+
return Response::generate(0, '保存成功', null, '[reload]');
91106
case 'cropper':
92107
$avatarType = null;
93108
if (Str::startsWith($avatar, 'data:image/jpeg;base64,')) {

‎module/Member/Docs/release.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
- 新增：VIP开通界面增加最近开通用户列表和倒计时，促进用户开通率
55
- 新增：用户自动注册前缀可设置，优化用户显示逻辑
66
- 新增：后台用户管理昵称点击可弹出用户详情管理弹窗
7+
- 新增：用户积分新增冻结、提交、取消三阶段操作功能
8+
- 新增：用户积分流水增加其他信息，支持冻结交易、管理员变更等信息展示
9+
- 新增：用户积分后台操作支持记录管理员 ID
10+
- 新增：后台用户钱包流水增加其他信息，可记录后台管理员变更信息
11+
- 新增：用户前台积分冻结记录显示功能
712
- 优化：授权登录默认注册为用户昵称（昵称不可作为登录用户名）
813

914
---

0 commit comments

Comments
 (0)