Skip to content

Commit 4bed4cb

Browse files
committed
feat: detail model detect, webpack compress option
1 parent 2c34b83 commit 4bed4cb

File tree

93 files changed

+703
-115
lines changed

Some content is hidden

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

93 files changed

+703
-115
lines changed

module/Banner/Docs/release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
- 新增:快速渲染方式
44
- 新增:手机自适应宽高比
5+
- 优化:浏览器自适应或尺寸变更时自动更新
56

67
---
78

module/Banner/Docs/release/1.0.0.md

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

module/Banner/Docs/release/1.1.0.md

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

module/Banner/Docs/release/1.2.0.md

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

module/Banner/Docs/release/1.3.0.md

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

module/Banner/View/pc/public/banner.blade.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,23 @@
9090
loop: true,
9191
autoplay: {
9292
delay: 3000
93+
},
94+
observer: true,
95+
observeParents: true,
96+
on: {
97+
observerUpdate: function(){
98+
swiperRefresh();
99+
},
100+
resize: function () {
101+
swiperRefresh();
102+
}
93103
}
94104
});
105+
var swiperRefresh = function(){
106+
setTimeout(function(){
107+
swiper.update();
108+
}, 500);
109+
};
95110
changeAnimate(swiper.slides[swiper.activeIndex]);
96111
swiper.on('slideChange',function(){
97112
changeAnimate(swiper.slides[swiper.activeIndex]);

module/Member/Admin/Controller/ConfigController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,20 @@ public function setting(AdminConfigBuilder $builder)
4444
'default' => '用户名密码注册',
4545
'phone' => '手机快捷注册',
4646
]);
47+
})
48+
->when('=', true, function ($builder) {
49+
$builder->switch('registerOauthEnable', '允许以授权方式注册');
4750
});
4851
if (modstart_module_enabled('MemberOauth')) {
4952
$builder->switch('Member_OauthBindPhoneEnable', '授权登录绑定手机');
5053
$builder->switch('Member_OauthBindEmailEnable', '授权登录绑定邮箱');
5154
}
55+
$builder->number('Member_UsernameMinLength', '用户名最小长度')->defaultValue(3);
5256
$builder->button('', '保存')->forSubmit();
5357
});
54-
$builder->layoutPanel('找回密码', function ($builder) {
58+
$builder->layoutPanel('账号安全', function ($builder) {
59+
$builder->switch('Member_ProfileEmailEnable', '开启邮箱绑定');
60+
$builder->switch('Member_ProfilePhoneEnable', '开启手机绑定');
5561
$builder->switch('retrieveDisable', '禁用找回密码')
5662
->when('!=', true, function ($builder) {
5763
$builder->switch('retrievePhoneEnable', '启用手机找回密码');

module/Member/Api/Controller/AuthController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ public function oauthBind($oauthType = null)
209209
Session::forget('oauthUserInfo');
210210
return Response::generateSuccessData(['memberUserId' => $ret['data']['memberUserId']]);
211211
}
212-
if (modstart_config()->getWithEnv('registerDisable', false)) {
212+
if (modstart_config()->getWithEnv('registerDisable', false)
213+
&& !modstart_config()->getWithEnv('registerOauthEnable', false)) {
213214
return Response::generate(-1, '用户注册已禁用');
214215
}
215216
$username = $input->getTrimString('username');

module/Member/Docs/release.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 3.3.0
2+
3+
- 新增:用户名长度可后台配置(默认为3)
4+
- 新增:禁止注册时允许设置以授权方式注册
5+
- 优化:账号资料邮箱绑定绑定界面根据注册方式优化
6+
7+
---
8+
19
## 3.2.0 VIP积分关联,多用户组判断,多处逻辑优化
210

311
- 新增:用户VIP开通赠送积分功能开启

module/Member/Util/MemberUtil.php

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ public static function get($id)
3939
return ModelUtil::get('member_user', ['id' => $id]);
4040
}
4141

42+
public static function getCached($id)
43+
{
44+
return Cache::remember('MemberUser:' . $id, 60, function () use ($id) {
45+
return self::get($id);
46+
});
47+
}
48+
4249
/**
4350
* @param $memberUser
4451
* @since Member 1.6.0
@@ -271,6 +278,22 @@ public static function autoSetUsernameNickname($memberUserId, $suggestName)
271278
self::suggestUsernameNickname($memberUserId, $suggestName, $randomLength);
272279
}
273280

281+
public static function getSuggestUsernameNickname($suggest)
282+
{
283+
$suggestName = $suggest . Str::random(1);
284+
for ($i = 0; $i < 20; $i++) {
285+
$found = ModelUtil::model('member_user')
286+
->where(['username' => $suggestName])
287+
->orWhere(['nickname' => $suggestName])
288+
->first();
289+
if (empty($found)) {
290+
return $suggestName;
291+
}
292+
$suggestName = $suggestName . Str::random(1);
293+
}
294+
return $suggestName . Str::random(10);
295+
}
296+
274297
private static function suggestUsernameNickname($memberUserId, $prefix = '用户', $randomLength = 6)
275298
{
276299
if ($randomLength > 0) {
@@ -349,7 +372,7 @@ public static function register($username = '', $phone = '', $email = '', $passw
349372
if ($ret['code']) {
350373
return $ret;
351374
}
352-
if (strlen($username) < 3) {
375+
if (strlen($username) < modstart_config('Member_UsernameMinLength', 3)) {
353376
return Response::generate(-1, '用户名至少3个字符');
354377
}
355378
// 为了统一登录时区分邮箱

0 commit comments

Comments
 (0)