From cdc56b8f31611a2bfd03e660c488047a7c78a8c3 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 20 十二月 2022 11:39:11 +0800
Subject: [PATCH] fix: 用户密码8-16长度并且不等于用户名称
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 5 ++++-
ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java | 1 -
ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java | 1 -
ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java | 1 -
ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java | 2 --
ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java | 16 ----------------
6 files changed, 4 insertions(+), 22 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 3eb84eb..d752805 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
@@ -306,7 +306,10 @@
if (StrUtil.isNotEmpty(param.getUsername())
&& StrUtil.isNotEmpty(param.getOldPassword())
&& StrUtil.isNotEmpty(param.getNewPassword())
- && !param.getNewPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{6,16}$")) {
+ && !param.getNewPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
+ return -1;
+ }
+ if(param.getUsername().equals(param.getNewPassword())){
return -1;
}
QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java
index cca4363..ef695ab 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java
index c39e052..2b78a38 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java
@@ -1,32 +1,16 @@
package com.ycl.controller.epuipment;
-import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.dict.DataDictionary;
-import com.ycl.entity.equipment.EquipmentBayonet;
import com.ycl.entity.equipment.Loudspeaker;
-import com.ycl.service.dict.IDataDictionaryService;
-import com.ycl.service.equipment.IEquipmentBayonetService;
import com.ycl.service.equipment.ILoudspeakerService;
-import com.ycl.vo.equipment.EquipmentBayonetVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.SneakyThrows;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.stream.Collectors;
/**
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java
index e952c59..d8be847 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java
@@ -10,8 +10,6 @@
import com.ycl.entity.equipment.OrgGrid;
import com.ycl.service.equipment.IOrgGridService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
index c262b31..349a9c9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
@@ -1,7 +1,6 @@
package com.ycl.controller.region;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java b/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
index 092435d..27b618f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
@@ -1,7 +1,6 @@
package com.ycl.controller.writ;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
--
Gitblit v1.8.0