From b4d2dbd68ed39bcf58c8afe50d7f5c06f14c237c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 27 二月 2023 09:51:55 +0800
Subject: [PATCH] bug修改

---
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index d752805..2e3e399 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -98,7 +98,6 @@
     @Transactional(rollbackFor = Exception.class)
     public UmsAdmin register(UmsAdminParam umsAdminParam) {
         UmsAdmin umsAdmin = new UmsAdmin();
-        //TODO mac,ip,鑱屽姟锛岀敤鎴风被鍨�
         BeanUtils.copyProperties(umsAdminParam, umsAdmin);
         umsAdmin.setCreateTime(new Date());
         umsAdmin.setStatus(1);
@@ -112,6 +111,13 @@
         }
         //灏嗗瘑鐮佽繘琛屽姞瀵嗘搷浣�
         String encodePassword = passwordEncoder.encode(umsAdmin.getPassword());
+
+        if ( !umsAdmin.getPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
+            Asserts.fail("瀵嗙爜闀垮害8鍒�16浣嶄笖瀵嗙爜涓殑瀛楃蹇呴』鍖呭惈瀛楁瘝锛堝ぇ鍐欐垨鑰呭皬鍐欙級鍜屽繀椤诲寘鍚暟瀛楋紝涓嶈兘鍖呭惈绌烘牸");
+        }
+        if(umsAdmin.getUsername().equals(umsAdmin.getPassword())){
+           Asserts.fail("瀵嗙爜涓嶈兘鍜岀櫥褰曞悕瀹屽叏涓�鑷�");
+        }
         umsAdmin.setPassword(encodePassword);
         baseMapper.insert(umsAdmin);
 
@@ -310,7 +316,7 @@
             return -1;
         }
         if(param.getUsername().equals(param.getNewPassword())){
-            return -1;
+            return -4;
         }
         QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
         wrapper.lambda().eq(UmsAdmin::getUsername, param.getUsername());

--
Gitblit v1.8.0