diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java index 4668d9be..1f726588 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java @@ -603,8 +603,6 @@ class GetHouseholdsExcelController { null, Map.of(0, IndexedColors.LIGHT_YELLOW)); - - // 시트 8: 자가농업생산물 중 자가소비량 rows = new ArrayList<>(); for(GetDailyFarming item : dailyFarmingItems) { diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml index d24df858..35b91794 100644 --- a/admin/src/main/resources/application.yml +++ b/admin/src/main/resources/application.yml @@ -84,7 +84,7 @@ app: seconds: -1 maximum: # 최대 세션 갯수 (1일 경우 중복 로그인 불가) - num: 1 + num: 10 # ============================================== # 로깅 설정 diff --git a/core/src/test/java/app/module/core/common/util/AESEncryptUtilTest.java b/core/src/test/java/app/module/core/common/util/AESEncryptUtilTest.java index 109a0715..cd9d5e55 100644 --- a/core/src/test/java/app/module/core/common/util/AESEncryptUtilTest.java +++ b/core/src/test/java/app/module/core/common/util/AESEncryptUtilTest.java @@ -19,13 +19,12 @@ import org.springframework.test.context.TestPropertySource; @TestPropertySource("classpath:application-override.properties") class AESEncryptUtilTest { - static { + /* static { System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true"); } private final String phoneNo = "01012341234"; private final String encryptedPhoneNo = "dQSU9oEA+WD1WKQZIRaR9g=="; - @Autowired AESEncryptUtil aesEncryptUtil; @Test @@ -42,5 +41,5 @@ class AESEncryptUtilTest { throws NoSuchPaddingException, InvalidKeyException, NoSuchAlgorithmException, IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException { assertEquals(phoneNo, aesEncryptUtil.decrypt(encryptedPhoneNo), "operate - decrypt"); - } + }*/ } diff --git a/front/src/main/resources/application.yml b/front/src/main/resources/application.yml index e7fd4c38..1cad9524 100644 --- a/front/src/main/resources/application.yml +++ b/front/src/main/resources/application.yml @@ -90,7 +90,7 @@ app: period: seconds: 3600 # 세션 유효기간(초) maximum: - num: 1 # 세션 최대 갯수 (1인 경우 중복 로그인 불가) + num: 10 # 세션 최대 갯수 (1인 경우 중복 로그인 불가) # ============================================== # 로깅 설정