校验密码强度

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 f1eaff6..09af455 100644 (file)
--- 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位字符")
         }