Skip to content

Commit dc87bb1

Browse files
modstartmodstart
committed
sql mode laravel9 optimized, mysql repository error convert optimized
1 parent cd2494f commit dc87bb1

30 files changed

Lines changed: 467 additions & 98 deletions

File tree

‎module/Member/Core/ModuleServiceProvider.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function boot(Dispatcher $events)
4949
MemberMenu::register(function () {
5050
$moneyEnable = ModuleManager::getModuleConfig('Member', 'moneyEnable', false);
5151
$creditEnable = ModuleManager::getModuleConfig('Member', 'creditEnable', false);
52-
$creditName = '我的' . ModuleManager::getModuleConfig('Member', 'creditName', '积分');
52+
$creditName = LM('Member', 'My') . ModuleManager::getModuleConfig('Member', 'creditName', LM('Member', 'Credit'));
5353
$addressEnable = ModuleManager::getModuleConfig('Member', 'addressEnable', false);
5454
return [
5555
[
@@ -58,7 +58,7 @@ public function boot(Dispatcher $events)
5858
'sort' => 900,
5959
'children' => [
6060
$moneyEnable ? [
61-
'title' => '我的钱包',
61+
'title' => LM('Member', 'MenuWallet'),
6262
'url' => modstart_web_url('member_money'),
6363
] : null,
6464
$creditEnable ? [
@@ -69,29 +69,29 @@ public function boot(Dispatcher $events)
6969
],
7070
[
7171
'icon' => 'user',
72-
'title' => '我的',
72+
'title' => LM('Member', 'My'),
7373
'sort' => 1000,
7474
'children' => [
7575
$addressEnable ? [
76-
'title' => '我的地址',
76+
'title' => LM('Member', 'MenuAddress'),
7777
'url' => modstart_web_url('member_address'),
7878
] : null,
7979
[
8080
'icon' => 'iconfont icon-comment',
81-
'title' => '我的消息',
81+
'title' => LM('Member', 'MenuMessage'),
8282
'url' => modstart_web_url('member_message'),
8383
],
8484
[
85-
'title' => '账号安全',
85+
'title' => LM('Member', 'MenuSecurity'),
8686
'url' => modstart_web_url('member_profile/security'),
8787
],
8888
[
89-
'title' => '账号资料',
89+
'title' => LM('Member', 'MenuAccount'),
9090
'url' => modstart_web_url('member_profile/profile'),
9191
],
9292
[
9393
'sort' => 999999,
94-
'title' => '退出登录',
94+
'title' => LM('Member', 'MenuLogout'),
9595
'url' => modstart_web_url('logout'),
9696
],
9797
]
@@ -105,16 +105,16 @@ public function boot(Dispatcher $events)
105105
MemberHomeIcon::register(function () {
106106
$moneyEnable = ModuleManager::getModuleConfig('Member', 'moneyEnable', false);
107107
$creditEnable = ModuleManager::getModuleConfig('Member', 'creditEnable', false);
108-
$creditName = '我的' . ModuleManager::getModuleConfig('Member', 'creditName', '积分');
108+
$creditName = LM('Member', 'My') . ModuleManager::getModuleConfig('Member', 'creditName', LM('Member', 'Credit'));
109109
return [
110110
[
111-
'title' => '我的',
111+
'title' => LM('Member', 'My'),
112112
'sort' => 1000,
113113
'children' => [
114114
$moneyEnable ? [
115115
'icon' => 'iconfont icon-pay',
116116
'value' => sprintf('￥%.2f', MemberMoneyUtil::getTotal(MemberUser::id())),
117-
'title' => '我的钱包',
117+
'title' => LM('Member', 'MenuWallet'),
118118
'url' => modstart_web_url('member_money'),
119119
] : null,
120120
$creditEnable ? [
@@ -125,27 +125,27 @@ public function boot(Dispatcher $events)
125125
] : null,
126126
[
127127
'icon' => 'iconfont icon-comment',
128-
'title' => '我的消息',
128+
'title' => LM('Member', 'MenuMessage'),
129129
'url' => modstart_web_url('member_message'),
130130
],
131131
[
132132
'icon' => 'iconfont icon-card',
133-
'title' => '我的资料',
133+
'title' => LM('Member', 'MenuAccount'),
134134
'url' => modstart_web_url('member_profile'),
135135
],
136136
[
137137
'icon' => 'iconfont icon-lock',
138-
'title' => '修改密码',
138+
'title' => LM('Member', 'ChangePassword'),
139139
'url' => modstart_web_url('member_profile/password'),
140140
],
141141
[
142142
'icon' => 'iconfont icon-user',
143-
'title' => '修改头像',
143+
'title' => LM('Member', 'ChangeAvatar'),
144144
'url' => modstart_web_url('member_profile/avatar'),
145145
],
146146
[
147147
'icon' => 'iconfont icon-lock',
148-
'title' => '退出登录',
148+
'title' => LM('Member', 'MenuLogout'),
149149
'url' => modstart_web_url('logout'),
150150
],
151151
]

‎module/Member/Lang/zh.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
return [
3+
'Login' => '登录',
4+
'Register' => '注册',
5+
'Credit' => '积分',
6+
'Open VIP' => '开通VIP',
7+
'My' => '我的',
8+
'MenuWallet' => '我的钱包',
9+
'MenuAddress' => '我的地址',
10+
'MenuMessage' => '我的消息',
11+
'MenuSecurity' => '账号安全',
12+
'MenuAccount' => '账号资料',
13+
'MenuLogout' => '退出登录',
14+
'ChangePassword' => '修改密码',
15+
'ChangeAvatar' => '修改头像',
16+
];

‎module/Member/Util/MemberCmsUtil.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use ModStart\Core\Assets\AssetsUtil;
88
use ModStart\Core\Dao\ModelUtil;
99
use ModStart\Field\AutoRenderedFieldValue;
10+
use Module\Member\Model\MemberUser;
1011

1112
class MemberCmsUtil
1213
{
@@ -20,7 +21,7 @@ public static function showFromId($memberUserId, $field = null)
2021
if (!$memberUserId) {
2122
return AutoRenderedFieldValue::make('<span class="ub-text-muted">-</span>');
2223
}
23-
$memberUser = ModelUtil::getWithCache('member_user', ['id' => $memberUserId]);
24+
$memberUser = ModelUtil::getWithCache(MemberUser::class, ['id' => $memberUserId]);
2425
return self::show($memberUser, $field);
2526
}
2627

‎module/Member/Util/MemberUtil.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ public static function putOauth($memberUserId, $oauthType, $openId, $info = [])
819819
LockUtil::release($lockKey);
820820
}
821821

822-
public static function forgetByMemberUserId($memberUserId)
822+
public static function forgetOauthByMemberUserId($memberUserId)
823823
{
824824
ModelUtil::delete('member_oauth', ['memberUserId' => $memberUserId]);
825825
}
@@ -878,6 +878,7 @@ public static function delete($memberUserId)
878878
$content['oauth'] = ArrayUtil::keepItemsKeys($oauths, [
879879
'type', 'openId', 'infoUsername', 'infoAvatar'
880880
]);
881+
$content['nickname'] = $memberUser['nickname'];
881882
ModelUtil::insert('member_deleted', [
882883
'id' => $memberUser['id'],
883884
'username' => $memberUser['username'],
@@ -889,10 +890,11 @@ public static function delete($memberUserId)
889890
'deleteAtTime' => 0,
890891
'isDeleted' => true,
891892
'username' => null,
893+
'nickname' => null,
892894
'phone' => null,
893895
'email' => null,
894896
]);
895-
self::forgetByMemberUserId($memberUserId);
897+
self::forgetOauthByMemberUserId($memberUserId);
896898
ModelUtil::transactionCommit();
897899
MemberUserDeletedEvent::fire($memberUserId);
898900
}

‎module/Member/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "Member",
3-
"title": "通用用户系统",
3+
"title": "用户系统",
44
"version": "4.5.0",
55
"modstartVersion": ">=3.9.0",
66
"author": "官方",
7-
"description": "提供基础的用户管理服务",
7+
"description": "提供基础的用户注册、登录服务",
88
"env": [
99
"laravel5",
1010
"laravel9"

‎module/Vendor/Docs/release.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 4.5.0
2+
3+
- 新增：RandomImageProvider 逻辑升级重构，支持更丰富的随机图片生成
4+
5+
---
6+
17
## 4.4.0 优化后台操作工具类，新增分类操作工具类
28

39
- 新增：订单快捷操作工具类 OrderUtil

‎module/Vendor/Provider/RandomImage/AbstractRandomImageProvider.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@
66

77
abstract class AbstractRandomImageProvider
88
{
9-
abstract public function get($param = []);
9+
abstract public function name();
10+
11+
abstract public function title();
12+
13+
abstract public function get($biz, $type = 'background', $param = []);
1014
}

‎module/Vendor/Provider/RandomImage/DefaultRandomImageProvider.php‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎module/Vendor/Provider/RandomImage/RandomImageProvider.php‎

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,63 @@
44
namespace Module\Vendor\Provider\RandomImage;
55

66

7+
use ModStart\Core\Assets\AssetsUtil;
8+
use ModStart\Core\Input\Response;
9+
use ModStart\Core\Util\SerializeUtil;
10+
use Module\Vendor\Provider\ProviderTrait;
11+
12+
13+
/**
14+
* @method static AbstractRandomImageProvider first()
15+
* @method static AbstractRandomImageProvider[] listAll()
16+
*/
717
class RandomImageProvider
818
{
9-
/**
10-
* @return AbstractRandomImageProvider
11-
*/
12-
public static function get()
19+
use ProviderTrait;
20+
21+
public static function getImage($provider, $biz, $type = 'background', $param = [])
1322
{
14-
static $instance = null;
15-
if (null === $instance) {
16-
$driver = config('RandomImageProvider');
17-
if (empty($driver)) {
18-
$driver = DefaultRandomImageProvider::class;
19-
}
20-
$instance = app($driver);
23+
$ret = null;
24+
$error = null;
25+
if ($provider) {
26+
$ret = $provider->get($biz, $type, $param);
27+
} else {
28+
$error = 'NoProvider';
29+
}
30+
if (Response::isSuccess($ret)) {
31+
return $ret['data'];
2132
}
22-
return $instance;
33+
if (isset($ret['msg'])) {
34+
$error = $ret['msg'];
35+
} else {
36+
$error = 'ERROR:' . SerializeUtil::jsonEncode($ret);
37+
}
38+
return [
39+
'url' => AssetsUtil::fixFull('asset/image/none.svg'),
40+
'error' => $error,
41+
];
2342
}
2443

25-
public static function getImage($biz = '', $param = [])
44+
public static function getProviderImage($name, $biz, $type = 'background', $param = [])
2645
{
27-
return self::get()->get(array_merge(['biz' => $biz], $param));
46+
$provider = self::getByName($name);
47+
return self::getImage($provider, $biz, $type, $param);
2848
}
49+
50+
public static function getConfigProviderImage($configName, $biz, $type = 'background', $param = [])
51+
{
52+
$name = modstart_config($configName, '');
53+
if ($name) {
54+
$provider = self::getByName($name);
55+
} else {
56+
$provider = self::first();
57+
}
58+
return self::getImage($provider, $biz, $type, $param);
59+
}
60+
61+
public static function getFirstImage($biz, $type = 'background', $param = [])
62+
{
63+
return self::getImage(self::first(), $biz, $type, $param);
64+
}
65+
2966
}

‎module/Vendor/Provider/RandomImage/RandomImageType.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
namespace Module\Vendor\Provider\RandomImage;
4+
5+
use ModStart\Core\Type\BaseType;
6+
7+
class RandomImageType implements BaseType
8+
{
9+
const BACKGROUND = 'background';
10+
const COVER = 'cover';
11+
12+
public static function getList()
13+
{
14+
return [
15+
self::BACKGROUND => '背景',
16+
self::COVER => '封面',
17+
];
18+
}
19+
}

0 commit comments

Comments
 (0)