From 749e6ab251e965147e6af1f03fb4956add28da97 Mon Sep 17 00:00:00 2001 From: linlinjava Date: Fri, 31 Jul 2020 11:54:23 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E5=90=8E=E7=AB=AF=E5=87=8F=E5=BC=B1=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E7=A0=81=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/web/AdminUserController.java | 4 ++-- .../litemall/wx/web/WxAddressController.java | 2 +- .../litemall/wx/web/WxAuthController.java | 6 +++--- .../litemall/wx/web/WxFeedbackController.java | 2 +- litemall-wx/pages/auth/register/register.js | 18 ------------------ litemall-wx/pages/auth/reset/reset.js | 9 --------- .../pages/ucenter/addressAdd/addressAdd.js | 5 ----- litemall-wx/pages/ucenter/feedback/feedback.js | 8 -------- .../pages/ucenter/addressAdd/addressAdd.js | 5 ----- 9 files changed, 7 insertions(+), 52 deletions(-) diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java index ac544adb..839a83d8 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java @@ -43,14 +43,14 @@ public class AdminUserController { return ResponseUtil.okList(userList); } @RequiresPermissions("admin:user:list") - @RequiresPermissionsDesc(menu = {"用户管理", "会员管理"}, button = "查询") + @RequiresPermissionsDesc(menu = {"用户管理", "会员管理"}, button = "详情") @GetMapping("/detail") public Object userDetail(@NotNull Integer id) { LitemallUser user=userService.findById(id); return ResponseUtil.ok(user); } @RequiresPermissions("admin:user:list") - @RequiresPermissionsDesc(menu = {"用户管理", "会员管理"}, button = "查询") + @RequiresPermissionsDesc(menu = {"用户管理", "会员管理"}, button = "编辑") @PostMapping("/update") public Object userUpdate(@RequestBody LitemallUser user) { return ResponseUtil.ok(userService.updateById(user)); diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java index 74f6f899..693b5a6e 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java @@ -79,7 +79,7 @@ public class WxAddressController extends GetRegionService { if (StringUtils.isEmpty(mobile)) { return ResponseUtil.badArgument(); } - if (!RegexUtil.isMobileExact(mobile)) { + if (!RegexUtil.isMobileSimple(mobile)) { return ResponseUtil.badArgument(); } diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java index f6a98719..93a8a730 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java @@ -189,7 +189,7 @@ public class WxAuthController { if (StringUtils.isEmpty(phoneNumber)) { return ResponseUtil.badArgument(); } - if (!RegexUtil.isMobileExact(phoneNumber)) { + if (!RegexUtil.isMobileSimple(phoneNumber)) { return ResponseUtil.badArgumentValue(); } @@ -256,7 +256,7 @@ public class WxAuthController { if (userList.size() > 0) { return ResponseUtil.fail(AUTH_MOBILE_REGISTERED, "手机号已注册"); } - if (!RegexUtil.isMobileExact(mobile)) { + if (!RegexUtil.isMobileSimple(mobile)) { return ResponseUtil.fail(AUTH_INVALID_MOBILE, "手机号格式不正确"); } //判断验证码是否正确 @@ -343,7 +343,7 @@ public class WxAuthController { if (StringUtils.isEmpty(phoneNumber)) { return ResponseUtil.badArgument(); } - if (!RegexUtil.isMobileExact(phoneNumber)) { + if (!RegexUtil.isMobileSimple(phoneNumber)) { return ResponseUtil.badArgumentValue(); } if (StringUtils.isEmpty(captchaType)) { diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFeedbackController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFeedbackController.java index 4698ae58..d37b7496 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFeedbackController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFeedbackController.java @@ -55,7 +55,7 @@ public class WxFeedbackController { if (StringUtils.isEmpty(mobile)) { return ResponseUtil.badArgument(); } - if (!RegexUtil.isMobileExact(mobile)) { + if (!RegexUtil.isMobileSimple(mobile)) { return ResponseUtil.badArgument(); } return null; diff --git a/litemall-wx/pages/auth/register/register.js b/litemall-wx/pages/auth/register/register.js index 54453db0..fa10d425 100644 --- a/litemall-wx/pages/auth/register/register.js +++ b/litemall-wx/pages/auth/register/register.js @@ -42,15 +42,6 @@ Page({ return false; } - if (!check.isValidPhone(this.data.mobile)) { - wx.showModal({ - title: '错误信息', - content: '手机号输入不正确', - showCancel: false - }); - return false; - } - wx.request({ url: api.AuthRegisterCaptcha, data: { @@ -145,15 +136,6 @@ Page({ return false; } - if (!check.isValidPhone(this.data.mobile)) { - wx.showModal({ - title: '错误信息', - content: '手机号输入不正确', - showCancel: false - }); - return false; - } - wx.login({ success: function(res) { if (!res.code) { diff --git a/litemall-wx/pages/auth/reset/reset.js b/litemall-wx/pages/auth/reset/reset.js index 3b821ee2..3e3fab66 100644 --- a/litemall-wx/pages/auth/reset/reset.js +++ b/litemall-wx/pages/auth/reset/reset.js @@ -70,15 +70,6 @@ Page({ return false; } - if (!check.isValidPhone(this.data.mobile)) { - wx.showModal({ - title: '错误信息', - content: '手机号输入不正确', - showCancel: false - }); - return false; - } - if (this.data.password.length < 3) { wx.showModal({ title: '错误信息', diff --git a/litemall-wx/pages/ucenter/addressAdd/addressAdd.js b/litemall-wx/pages/ucenter/addressAdd/addressAdd.js index c8fd8a68..4522ed9b 100644 --- a/litemall-wx/pages/ucenter/addressAdd/addressAdd.js +++ b/litemall-wx/pages/ucenter/addressAdd/addressAdd.js @@ -322,11 +322,6 @@ Page({ return false; } - if (!check.isValidPhone(address.tel)) { - util.showErrorToast('手机号不正确'); - return false; - } - let that = this; util.request(api.AddressSave, { id: address.id, diff --git a/litemall-wx/pages/ucenter/feedback/feedback.js b/litemall-wx/pages/ucenter/feedback/feedback.js index 741d4222..aae9f5d6 100644 --- a/litemall-wx/pages/ucenter/feedback/feedback.js +++ b/litemall-wx/pages/ucenter/feedback/feedback.js @@ -117,14 +117,6 @@ Page({ return false; } - if (!check.isValidPhone(this.data.mobile)) { - this.setData({ - mobile: '' - }); - util.showErrorToast('请输入手机号码'); - return false; - } - wx.showLoading({ title: '提交中...', mask: true, diff --git a/renard-wx/pages/ucenter/addressAdd/addressAdd.js b/renard-wx/pages/ucenter/addressAdd/addressAdd.js index 6dacb885..15d594f5 100644 --- a/renard-wx/pages/ucenter/addressAdd/addressAdd.js +++ b/renard-wx/pages/ucenter/addressAdd/addressAdd.js @@ -322,11 +322,6 @@ Page({ return false; } - if (!check.isValidPhone(address.tel)) { - util.showErrorToast('手机号不正确'); - return false; - } - let that = this; util.request(api.AddressSave, { id: address.id,