Merge branch 'first_open_fetch' into 'dev'
# Conflicts: # core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java
This commit is contained in:
@@ -126,41 +126,4 @@ public class CommonUtil {
|
||||
flashMessages.add(msg);
|
||||
session.setAttribute("flashAlertMessages", flashMessages);
|
||||
}
|
||||
|
||||
public static String normalizePath(String path) {
|
||||
if (path == null || path.trim().isEmpty()) {
|
||||
log.warn("normalizePath: Input path is null or empty, returning default path");
|
||||
String defaultPath = System.getProperty("user.home") + File.separator + "Downloads";
|
||||
return Paths.get(defaultPath).toAbsolutePath().normalize().toString();
|
||||
}
|
||||
|
||||
try {
|
||||
// Paths.get을 사용하여 경로 정규화
|
||||
Path normalizedPath = Paths.get(path).toAbsolutePath().normalize();
|
||||
String result = normalizedPath.toString();
|
||||
log.debug("Normalized path: {}", result);
|
||||
return result;
|
||||
} catch (Exception e) {
|
||||
log.error("Error normalizing path: {}", path, e);
|
||||
throw new IllegalArgumentException("Failed to normalize path: " + path, e);
|
||||
}
|
||||
}
|
||||
|
||||
public static void createDirectories(File directory) {
|
||||
if (directory == null) {
|
||||
throw new IllegalArgumentException("Directory cannot be null");
|
||||
}
|
||||
try {
|
||||
if (!directory.exists()) {
|
||||
boolean created = directory.mkdirs();
|
||||
log.info("Directory created: {} (Success: {})", directory.getAbsolutePath(), created);
|
||||
}
|
||||
if (!directory.canWrite()) {
|
||||
throw new IOException("No write permission for directory: " + directory.getAbsolutePath());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to create directory: {}", directory.getAbsolutePath(), e);
|
||||
throw new RuntimeException("Failed to create directory", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,6 +28,7 @@ class UpdateFileDao implements UpdateFilePortOut {
|
||||
command.getType().getName()
|
||||
)));
|
||||
|
||||
|
||||
if (!deletedFileList.isEmpty()) {
|
||||
mapper.deleteFile(
|
||||
AuditUtil.delete(new UpdateUploadFileParam(
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
package app.module.core.common.util;
|
||||
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.TestPropertySource;
|
||||
|
||||
@SpringBootTest
|
||||
@TestPropertySource("classpath:application-override.properties")
|
||||
class AESEncryptUtilTest {
|
||||
|
||||
/* static {
|
||||
System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true");
|
||||
}
|
||||
|
||||
private final String phoneNo = "01012341234";
|
||||
private final String encryptedPhoneNo = "dQSU9oEA+WD1WKQZIRaR9g==";
|
||||
AESEncryptUtil aesEncryptUtil;
|
||||
|
||||
@Test
|
||||
@DisplayName("operate - AESEncryptUtilTest (암호화)")
|
||||
void encrypt()
|
||||
throws NoSuchPaddingException, InvalidKeyException, NoSuchAlgorithmException,
|
||||
IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException {
|
||||
assertEquals(encryptedPhoneNo, aesEncryptUtil.encrypt(phoneNo), "operate - encrypt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("operate - AESEncryptUtilTest (복호화)")
|
||||
void decrypt()
|
||||
throws NoSuchPaddingException, InvalidKeyException, NoSuchAlgorithmException,
|
||||
IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException {
|
||||
assertEquals(phoneNo, aesEncryptUtil.decrypt(encryptedPhoneNo), "operate - decrypt");
|
||||
}*/
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
# disable JNDI lookup
|
||||
spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration
|
||||
spring.profiles.active=local
|
||||
spring.jpa.hibernate.ddl-auto=create
|
||||
spring.datasource.url=jdbc:h2:~/test;
|
||||
spring.datasource.username=sa
|
||||
spring.datasource.password=
|
||||
spring.datasource.driver-class-name=org.h2.Driver
|
||||
spring.jpa.properties.hibernate.show_sql=true
|
||||
logging.level.org.hibernate.type.descriptor.sql=trace
|
||||
front-app.initData.test=true
|
||||
Reference in New Issue
Block a user