From db0c3e66f43fa49560b2c98b2a38afb5fe5578e9 Mon Sep 17 00:00:00 2001
From: qiaowei <jov123@163.com>
Date: Thu, 18 Jul 2019 14:15:46 +0800
Subject: [PATCH] =?utf8?q?=E6=A0=A1=E9=AA=8C=E5=AF=86=E7=A0=81=E5=BC=BA?=
 =?utf8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
index f1eaff6f..09af4554 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.bind.annotation.RequestParam
 import java.time.Duration
 import java.util.Calendar
-import org.bouncycastle.cms.RecipientId.password
 
 
 @RestController
@@ -568,6 +567,9 @@ class ApiV1 {
         if (newpwd != renewpwd) {
             return JsonResult.error("两次密码不一致，请确认")
         }
+        if (!newpwd.matches(Regex("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,32}$"))) {
+            return JsonResult.error("密码必须包含数字和字符，长度6~32位")
+        }
         if (newpwd.isEmpty() || newpwd.length < 6) {
             return JsonResult.error("请重新设置密码，密码不能小于6位字符")
         }
-- 
2.17.1