From 592d5ed994f59964f1530c49ad068cda005eb41f Mon Sep 17 00:00:00 2001 From: lzm <17817447469@163.com> Date: Mon, 28 Nov 2022 12:26:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=8E=88=E6=9D=83?= =?UTF-8?q?=EF=BC=9A=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=E5=8F=8A=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=89=8B=E6=9C=BA=E6=97=A5=E5=BF=97=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/PhoneAuthApplyRecordAdminController.java | 6 +++--- .../static/html/users/phone_auth_apply_admin.html | 13 +++++++++---- .../java/com/accompany/common/utils/CommonUtil.java | 4 +++- .../business/controller/SmsController.java | 1 + .../service/account/AccountH5LoginService.java | 2 +- .../oauth2/controller/AccountController.java | 2 +- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneAuthApplyRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneAuthApplyRecordAdminController.java index b84e67f27..7bc8906d4 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneAuthApplyRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneAuthApplyRecordAdminController.java @@ -51,13 +51,13 @@ public class PhoneAuthApplyRecordAdminController extends BaseController { } @RequestMapping("/remark") - public void remark(Long id, String message){ - if(id == null || id == 0 || StringUtils.isEmpty(message)) { + public void remark(Long id, String remark){ + if(id == null || id == 0 || StringUtils.isEmpty(remark)) { writeJson(false, "参数不能为空"); return; } try { - phoneAuthApplyRecordAdiminService.remark(id, message, getAdminName()); + phoneAuthApplyRecordAdiminService.remark(id, remark, getAdminName()); writeJson(true,"操作成功"); } catch (Exception e) { logger.error("Failed to change dynamic status, Cause by:", e); diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/users/phone_auth_apply_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/users/phone_auth_apply_admin.html index 064c999cb..571e88abe 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/users/phone_auth_apply_admin.html +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/users/phone_auth_apply_admin.html @@ -26,6 +26,8 @@ + +
至 @@ -272,17 +274,20 @@ //备注 $('#table').on('click','.opt-remark',function () { var id = $(this).attr('data-id'); - var remark = $(this).attr('data-remark'); + let remark = $(this).attr('data-remark'); $('#messageForm')[0].reset(); $('#id').val(id); - $('#remark').val(remark); + if (remark && !remark.match(/undefined/)) { + $('#remark').val(remark); + } + $('#messageModel').modal('show'); }); //审核不通过保存原因 $('#create').on('click', function () { - var pid = $('#pid').val(); - var message = $('#message').val(); + var id = $('#id').val(); + var remark = $('#remark').val(); if($("#messageForm").validationEngine('validate')){ $.ajax({ type: 'post', diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonUtil.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonUtil.java index d179e76cd..752d698ac 100644 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonUtil.java +++ b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonUtil.java @@ -274,7 +274,9 @@ public class CommonUtil { try { log.info("checkPhoneFormat, phone {}", phone); Phonenumber.PhoneNumber swissNumberProto = phoneUtil.parse(phone, null); - return phoneUtil.isValidNumber(swissNumberProto); + boolean validNumber = phoneUtil.isValidNumber(swissNumberProto); + log.info("checkPhoneFormat, phone {}, swissNumberProto:{}, result:{}", phone,swissNumberProto,validNumber); + return validNumber; } catch (NumberParseException e) { log.error("checkPhoneFormat error", e); return false; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/SmsController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/SmsController.java index 7d9eab9bb..ae4299172 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/SmsController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/SmsController.java @@ -82,6 +82,7 @@ public class SmsController extends BaseController { @RequestParam("code") String code,HttpServletRequest request) { Long uid = getUid(request); mobile = decryptSensitiveInfo(request, mobile); + log.info("sms/verify mobile {} phoneAreaCode {}",mobile,phoneAreaCode); if(uid != null){ Users users = usersBaseService.getUsersByUid(uid); mobile = users == null ? mobile : users.getPhone(); diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountH5LoginService.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountH5LoginService.java index 1987e0ac4..4881323bd 100644 --- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountH5LoginService.java +++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountH5LoginService.java @@ -192,7 +192,7 @@ public class AccountH5LoginService { if (null != account) { throw new ServiceException(BusiStatus.PHONE_REGISTERED); } - if (CommonUtil.checkPhoneFormat(phoneAreaCode,mobile)){ + if (!CommonUtil.checkPhoneFormat(phoneAreaCode,mobile)){ throw new ServiceException(BusiStatus.PHONEINVALID); } diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/AccountController.java b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/AccountController.java index 6a6d04277..590200b8c 100644 --- a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/AccountController.java +++ b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/AccountController.java @@ -209,7 +209,7 @@ public class AccountController extends BaseController { } } - if (CommonUtil.checkPhoneFormat(phoneAreaCode,phone)){ + if (!CommonUtil.checkPhoneFormat(phoneAreaCode,phone)){ throw new ServiceException(BusiStatus.PHONEINVALID); }