Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngFileCheckerApiController.java
#	src/main/resources/application-local.yml
This commit is contained in:
DanielLee
2025-12-12 18:54:34 +09:00
20 changed files with 177 additions and 148 deletions

View File

@@ -8,8 +8,8 @@ import lombok.Getter;
@AllArgsConstructor
public enum StatusType implements EnumType {
ACTIVE("활성"),
INACTIVE("비활성"),
DELETED("삭제");
INACTIVE("미사용"),
PENDING("보류");
private final String desc;

View File

@@ -0,0 +1,18 @@
package com.kamco.cd.kamcoback.common.utils;
import java.util.regex.Pattern;
public class CommonStringUtils {
/**
* 영문, 숫자, 특수문자를 모두 포함하여 8~20자 이내의 비밀번호
*
* @param password
* @return
*/
public static boolean isValidPassword(String password) {
String passwordPattern =
"^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*()_+\\-\\[\\]{};':\"\\\\|,.<>/?]).{8,20}$";
return Pattern.matches(passwordPattern, password);
}
}