From aac317ddbc406846c5c5bcbb062b4a11bc8e4d4e Mon Sep 17 00:00:00 2001
From: qiaowei <jov123@163.com>
Date: Mon, 15 Jul 2019 13:41:30 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

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 cf71a6d6..fb20554f 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
@@ -25,6 +25,9 @@ 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
@@ -145,6 +148,9 @@ class ApiInit {
         if (pwd.isEmpty() || repwd.isEmpty() || pwd.length < 6) {
             return JsonResult.error("请重新设置密码，密码不能小于6位字符")
         }
+        if (!pwd.matches(Regex("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,32}$"))) {
+            return JsonResult.error("密码必须包含数字和字符，长度6~32位")
+        }
         if (pwd != repwd) {
             return JsonResult.error("两次密码不一致")
         }
-- 
2.17.1