Merge branch 'refs/heads/dev' into first_open_fetch

# Conflicts:
#	core/src/test/java/app/module/core/common/util/AESEncryptUtilTest.java
This commit is contained in:
주수현
2025-07-21 10:11:56 +09:00
1593 changed files with 21739 additions and 47968 deletions

View File

@@ -1,12 +1,13 @@
package app.module.core.config.adapters.persistence.component;
import app.module.core.config.application.util.CommonUtil;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import java.time.LocalDateTime;
@Getter
@Setter
public class AuditCommand {

View File

@@ -1,9 +1,10 @@
package app.module.core.config.adapters.persistence.component;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
/**
* 생성 및 수정 기록을 위한 공용 엔티티 속성. Admin 앱의 경우, LoginUserAuditAware.java (AuditorAware 구현체) 가 반환한 현재 작성자
* 정보를 담는다.

View File

@@ -1,12 +1,13 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.time.LocalDateTime;
@Getter
@Setter
@NoArgsConstructor

View File

@@ -1,11 +1,7 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.*;
@Getter
@Setter

View File

@@ -1,56 +0,0 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class Article extends AuditEntity {
private Long id;
private String title;
private String content;
private Boolean visible;
private LocalDateTime startDate;
private LocalDateTime endDate;
private Integer orderNo;
private List<UploadFile> uploadFiles = Collections.emptyList();
private List<ArticleComment> articleComments = Collections.emptyList();
public Article(Long id) {
this.id = id;
}
public Article(
Long id,
String title,
String content,
Boolean visible,
LocalDateTime startDate,
LocalDateTime endDate,
Integer orderNo,
List<UploadFile> uploadFiles) {
this.id = id;
this.title = title;
this.content = content;
this.visible = visible;
this.startDate = startDate;
this.endDate = endDate;
this.orderNo = orderNo;
this.uploadFiles = (uploadFiles != null) ? uploadFiles : Collections.emptyList();
}
}

View File

@@ -1,20 +0,0 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class ArticleComment extends AuditEntity {
private Long id;
private String content;
private Long articleId;
}

View File

@@ -1,22 +0,0 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class ArticleHasUploadFile extends AuditEntity {
private Long articleId;
private Long uploadFilesId;
public ArticleHasUploadFile(Long articleId) {
this.articleId = articleId;
}
}

View File

@@ -2,12 +2,13 @@ package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import app.module.core.config.application.enums.SignUpType;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.time.LocalDateTime;
@Getter
@Setter
@NoArgsConstructor

View File

@@ -1,29 +0,0 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import app.module.core.config.application.enums.SocialType;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class FrontUserSocial extends AuditEntity {
private Integer seq;
private String userId;
private SocialType socialType;
private String socialId;
private String email;
private String name;
private String ci;
}

View File

@@ -1,7 +1,6 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -41,7 +40,7 @@ public class Household extends AuditEntity {
private Integer scaleCode;
private Integer employmentCode;
private Integer employmentType;
private Boolean isPanel;

View File

@@ -2,12 +2,9 @@ package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import app.module.core.config.application.enums.AppType;
import lombok.*;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
/**
* 동시접속 사용자 체크를 위한 기록용 엔티티

View File

@@ -1,10 +1,11 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import java.util.Date;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
/**
* Spring Security - Remember me 기능을 위한 엔티티
*/

View File

@@ -2,11 +2,12 @@ package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import app.module.core.config.application.enums.AppType;
import java.util.Set;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import java.util.Set;
@Getter
@Setter
@AllArgsConstructor

View File

@@ -1,7 +1,6 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import java.util.Set;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

View File

@@ -2,12 +2,9 @@ package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import app.module.core.config.application.enums.AppType;
import lombok.*;
import java.util.Set;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter

View File

@@ -2,11 +2,7 @@ package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import app.module.core.config.application.enums.FileUploadType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.*;
@Getter
@Setter
@@ -26,6 +22,8 @@ public class UploadFile extends AuditEntity {
private String originName;
private Long fileLength;
private String ocr;
private Long dailyRecordSeq;
public UploadFile(Long id) {
this.id = id;

View File

@@ -1,11 +1,7 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.*;
@Getter
@Setter

View File

@@ -1,7 +1,6 @@
package app.module.core.config.adapters.persistence.initData;
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;

View File

@@ -1,49 +0,0 @@
package app.module.core.config.adapters.persistence.initData;
import app.module.core.config.adapters.persistence.initData.helper.RemoveAllArticleMapper;
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortIn;
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
import java.time.LocalDateTime;
import java.util.stream.IntStream;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
@Component
@RequiredArgsConstructor
public class InitArticleData implements ApplicationRunner {
private final CreateArticlePortIn createArticlePortIn;
private final RemoveAllArticleMapper removeAllArticleMapper;
@Value("${app.initData.core}")
private boolean isCoreDataRequired;
@Override
public void run(ApplicationArguments args) throws Exception {
if (!isCoreDataRequired) {
return;
}
// article_has_upload_file 테이블 우선 삭제
removeAllArticleMapper.deleteAllFiles();
// article_comment 테이블 우선 삭제
removeAllArticleMapper.deleteAllComments();
// article 전체 데이터 삭제
removeAllArticleMapper.deleteAll();
IntStream.range(0, 25)
.forEach(
idx ->
createArticlePortIn.operate(
new CreateArticleCmd(
String.format("Article No.%s", idx),
String.format("Content No.%s", idx),
true,
LocalDateTime.now(),
LocalDateTime.now().plusMonths(2),
null)));
}
}

View File

@@ -1,14 +1,7 @@
package app.module.core.config.adapters.persistence.initData;
import app.module.core.config.adapters.persistence.entity.Role;
import app.module.core.config.application.enums.AppType;
import app.module.core.usecase.privilege.view.adapters.persistence.PrivilegeViewMapper;
import app.module.core.usecase.privilege.view.ports.application.domain.PrivilegeView;
import app.module.core.usecase.role.save.adapters.persistence.RoleSaveMapper;
import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeSaveParam;
import app.module.core.usecase.role.save.ports.RoleSavePortIn;
import java.time.LocalDateTime;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
@@ -16,6 +9,8 @@ import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
@RequiredArgsConstructor
@Order(3)

View File

@@ -3,8 +3,6 @@ package app.module.core.config.adapters.persistence.initData;
import app.module.core.config.application.enums.AppType;
import app.module.core.usecase.uri.save.ports.URISavePortIn;
import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand;
import java.io.IOException;
import java.util.Set;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -14,6 +12,9 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.Set;
@Component
@RequiredArgsConstructor
@Slf4j
@@ -34,14 +35,6 @@ public class InitUriAdminData implements ApplicationRunner {
final String ADMIN = "uri.admin";
final String ADMIN_BOARD = "uri.admin.board";
final String ADMIN_ARTICLE = "uri.admin.board.article";
final String ADMIN_ARTICLE_CREATE = "uri.admin.board.article.create";
final String ADMIN_ARTICLE_UPDATE = "uri.admin.board.article.update.{{pathVar}}";
final String ADMIN_ARTICLE_DELETE = "uri.admin.board.article.delete";
final String ADMIN_ARTICLE_EXCEL = "uri.admin.board.article.excel";
final String ADMIN_SETTINGS = "uri.admin.settings";
final String ADMIN_SETTINGS_ADMIN_GROUP = "uri.admin.settings.admins.group";
@@ -53,12 +46,6 @@ public class InitUriAdminData implements ApplicationRunner {
final String ADMIN_SETTINGS_ADMIN_ROLE = "uri.admin.settings.adminRoles";
final String ADMIN_SETTINGS_ADMIN_PRIVILEGE = "uri.admin.settings.adminPrivilege";
final String ADMIN_SETTINGS_USER_GROUP = "uri.admin.settings.user.group";
final String ADMIN_SETTINGS_USER = "uri.admin.settings.user";
final String ADMIN_SETTINGS_USER_UPDATE = "uri.admin.settings.user.update";
final String ADMIN_SETTINGS_USER_ROLE = "uri.admin.settings.user.role";
final String ADMIN_SETTINGS_USER_PRIVILEGE = "uri.admin.settings.user.privilege";
final String ADMIN_SETTINGS_URI_ADMIN = "uri.admin.settings.uri.admin";
final String ADMIN_SETTINGS_URI_FRONT = "uri.admin.settings.uri.front";
final String ADMIN_SETTINGS_CODE = "uri.admin.settings.uicode";
@@ -69,10 +56,6 @@ public class InitUriAdminData implements ApplicationRunner {
"uri.admin.analysis.operationLog.{{pathVar}}";
final String ADMIN_ANALYSIS_OPERATION_LOG_EXCEL = "uri.admin.analysis.operationLog.excel";
final String ADMIN_ADD_ONS = "uri.admin.addons";
final String ADMIN_ADD_ONS_SEND_EMAIL = "uri.admin.addons.email";
final String ADMIN_ADD_ONS_SEND_EMAIL_CREATE = "uri.admin.addons.email.create";
// 임가현황 메뉴
final String ADMIN_HOUSEHOLD = "uri.admin.household"; // 1depth
final String ADMIN_HOUSEHOLD_STATUS = "uri.admin.household.households"; // 2depth 임가 리스트
@@ -146,15 +129,6 @@ public class InitUriAdminData implements ApplicationRunner {
true,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN,
ADMIN_BOARD,
"게시판",
"/board",
true,
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
ADMIN,
@@ -164,15 +138,6 @@ public class InitUriAdminData implements ApplicationRunner {
true,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN,
ADMIN_ADD_ONS,
"Add-ons (부가기능)",
"/add-ons",
true,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN,
@@ -292,7 +257,7 @@ public class InitUriAdminData implements ApplicationRunner {
ADMIN_COMMUNICATION,
ADMIN_COMMUNICATION_SUGGESTION_VIEW,
"건의사항 상세",
"/communication/suggestions/view/{{pathVar}}",
"/communication/suggestions/{{pathVar}}",
false,
Set.of("ROLE_ADMIN"));
@@ -304,53 +269,8 @@ public class InitUriAdminData implements ApplicationRunner {
"/communication/sms",
true,
Set.of("ROLE_ADMIN"));
// 커뮤니케이션 메뉴 끝
// 예제 게시판 - 시작
appendURI(
AppType.ADMIN,
ADMIN_BOARD,
ADMIN_ARTICLE,
"예제 게시판",
"/board/articles",
true,
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
ADMIN_ARTICLE,
ADMIN_ARTICLE_CREATE,
"예제 게시판 등록",
"/board/articles/create",
false,
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
ADMIN_ARTICLE,
ADMIN_ARTICLE_UPDATE,
"예제 게시판 수정",
"/board/articles/{{pathVar}}",
false,
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
ADMIN_ARTICLE,
ADMIN_ARTICLE_DELETE,
"예제 게시판 삭제",
"/board/articles/delete",
false,
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
ADMIN_ARTICLE,
ADMIN_ARTICLE_EXCEL,
"예제 게시판 엑셀 다운로드",
"/board/articles/excel",
false,
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
// 예제 게시판 - 끝
// 분석 메뉴 시작
appendURI(
@@ -382,37 +302,7 @@ public class InitUriAdminData implements ApplicationRunner {
// 분석 메뉴 끝
// Add-ons 메뉴 시작
appendURI(
AppType.ADMIN,
ADMIN_ADD_ONS,
ADMIN_ADD_ONS_SEND_EMAIL,
"Email 발송",
"/addons/email/form",
true,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN_ADD_ONS_SEND_EMAIL,
ADMIN_ADD_ONS_SEND_EMAIL_CREATE,
"Email 입력폼",
"/addons/email/form",
false,
Set.of("ROLE_ADMIN"));
// Add-ons 메뉴 끝
// 관리자 시작
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS,
ADMIN_SETTINGS_ADMIN_GROUP,
"관리자 & 역할",
"/settings/adminGroup",
true,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_ADMIN_GROUP,
@@ -458,71 +348,6 @@ public class InitUriAdminData implements ApplicationRunner {
false,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_ADMIN_GROUP,
ADMIN_SETTINGS_ADMIN_ROLE,
"관리자 역할",
"/settings/adminRoles",
true,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_ADMIN_GROUP,
ADMIN_SETTINGS_ADMIN_PRIVILEGE,
"관리자 권한",
"/settings/adminPrivilege",
true,
Set.of("ROLE_ADMIN"));
// 사용자 & 역할 - 시작
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS,
ADMIN_SETTINGS_USER_GROUP,
"사용자 & 역할",
"/settings/userGroup",
true,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_USER_GROUP,
ADMIN_SETTINGS_USER,
"사용자 목록",
"/settings/users",
true,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_USER,
ADMIN_SETTINGS_USER_UPDATE,
"사용자 수정",
"/settings/users/{{pathVar}}",
false,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_USER_GROUP,
ADMIN_SETTINGS_USER_ROLE,
"사용자 역할",
"/settings/userRoles",
true,
Set.of("ROLE_ADMIN"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_USER_GROUP,
ADMIN_SETTINGS_USER_PRIVILEGE,
"사용자 권한",
"/settings/userPrivilege",
true,
Set.of("ROLE_ADMIN"));
// 사용자 & 역할 - 끝
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS,

View File

@@ -1,15 +1,8 @@
package app.module.core.config.adapters.persistence.initData;
import app.module.core.config.adapters.persistence.initData.helper.RemoveAllFrontURIMapper;
import app.module.core.config.application.enums.AppType;
import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn;
import app.module.core.usecase.uri.getUris.ports.application.domain.URIElement;
import app.module.core.usecase.uri.save.ports.URISavePortIn;
import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -19,6 +12,9 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.Set;
@Component
@RequiredArgsConstructor
@Slf4j
@@ -109,77 +105,5 @@ public class InitUriFrontData implements ApplicationRunner {
Set.of("ROLE_GENERAL")),
null,
false);
// 예제게시판
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".board.articles",
FRONT_ROOT_ID,
AppType.FRONT,
"/board/articles",
true,
"예제게시판",
null,
"예제게시판",
"예제게시판 페이지",
"예제게시판",
null,
Set.of("ROLE_GENERAL")),
null,
false);
// 예제 게시판 등록
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".board.article.create",
FRONT_ROOT_ID,
AppType.FRONT,
"/board/articles/create",
false,
"예제 게시판 등록",
null,
"예제 게시판 등록",
"예제 게시판 등록 페이지",
"예제 게시판 등록",
null,
Set.of("ROLE_GENERAL")),
null,
false);
// 예제 게시판 상세
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".board.article.{{pathVar}}",
FRONT_ROOT_ID,
AppType.FRONT,
"/board/articles/{{pathVar}}",
false,
"예제 게시판 상세",
null,
"예제 게시판 상세",
"예제 게시판 상세 페이지",
"예제 게시판 상세",
null,
Set.of("ROLE_GENERAL")),
null,
false);
// 예제 게시판 수정
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".board.article.update.{{pathVar}}",
FRONT_ROOT_ID,
AppType.FRONT,
"/board/articles/update/{{pathVar}}",
false,
"예제 게시판 수정",
null,
"예제 게시판 수정",
"예제 게시판 수정 페이지",
"예제 게시판 수정",
null,
Set.of("ROLE_GENERAL")),
null,
false);
}
}

View File

@@ -2,7 +2,6 @@ package app.module.core.config.adapters.persistence.initData;
import app.module.core.usecase.userRole.saveUserRole.ports.SaveUserRolePortIn;
import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRoleCmd;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
@@ -10,6 +9,8 @@ import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
@RequiredArgsConstructor
@Order(3)

View File

@@ -1,11 +1,6 @@
package app.module.core.config.adapters.persistence.initData;
import app.module.core.config.adapters.persistence.initData.helper.RemoveAllArticleMapper;
import app.module.core.config.adapters.persistence.initData.helper.RemoveAllMapper;
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortIn;
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
import java.time.LocalDateTime;
import java.util.stream.IntStream;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;

View File

@@ -1,9 +1,10 @@
package app.module.core.config.adapters.persistence.initData.helper;
import app.module.core.config.application.enums.AppType;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface RemoveAllAdminURIMapper {
void deleteAllByAppType(AppType appType);

View File

@@ -1,10 +0,0 @@
package app.module.core.config.adapters.persistence.initData.helper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface RemoveAllArticleMapper {
void deleteAll();
void deleteAllFiles();
void deleteAllComments();
}

View File

@@ -1,9 +1,10 @@
package app.module.core.config.adapters.persistence.initData.helper;
import app.module.core.config.application.enums.AppType;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface RemoveAllFrontURIMapper {
void deleteAllByAppType(AppType appType);

View File

@@ -1,9 +0,0 @@
package app.module.core.config.adapters.persistence.repository;
import app.module.core.config.adapters.persistence.entity.ArticleComment;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ArticleCommentRepo {
}

View File

@@ -1,8 +0,0 @@
package app.module.core.config.adapters.persistence.repository;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ArticleRepo {
}

View File

@@ -1,9 +0,0 @@
package app.module.core.config.adapters.persistence.repository;
import app.module.core.config.adapters.persistence.entity.Privilege;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface FrontUserPrivilegeRepo {
}

View File

@@ -1,8 +0,0 @@
package app.module.core.config.adapters.persistence.repository;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface FrontUserRepo {
}

View File

@@ -1,13 +0,0 @@
package app.module.core.config.adapters.persistence.repository;
import app.module.core.config.adapters.persistence.entity.Role;
import app.module.core.config.application.enums.AppType;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.data.domain.Sort;
@Mapper
public interface FrontUserRoleRepo {
List<Role> findByAppType(AppType appType, Sort sort);
}

View File

@@ -1,12 +0,0 @@
package app.module.core.config.adapters.persistence.repository;
import app.module.core.config.adapters.persistence.entity.Privilege;
import app.module.core.config.application.enums.AppType;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.data.domain.Sort;
@Mapper
public interface PrivilegeRepo {
List<Privilege> findByAppType(AppType appType, Sort sort);
}

View File

@@ -2,10 +2,11 @@ package app.module.core.config.adapters.persistence.repository;
import app.module.core.config.adapters.persistence.entity.Role;
import app.module.core.config.application.enums.AppType;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.data.domain.Sort;
import java.util.List;
@Mapper
public interface RoleRepo {

View File

@@ -3,7 +3,6 @@ package app.module.core.config.adapters.web.advice;
import app.module.core.config.application.exception.NoMatchingURIException;
import app.module.core.config.application.util.CommonUtil;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
@@ -15,6 +14,8 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Optional;
/**
* 전역 예외 제어 객체.
*/

View File

@@ -1,9 +1,6 @@
package app.module.core.config.adapters.web.interceptor;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.SqlCommandType;
@@ -15,6 +12,10 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
@Intercepts({
@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})
})

View File

@@ -3,7 +3,6 @@ package app.module.core.config.adapters.web.interceptor;
import app.module.core.usecase.uri.currentmatch.ports.application.domain.URICurrentMatching;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Set;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.AccessDeniedException;
@@ -12,6 +11,8 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import java.util.Set;
@Component
@RequiredArgsConstructor
@Slf4j

View File

@@ -1,10 +1,11 @@
package app.module.core.config.adapters.web.interceptor.model;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
@Getter
@Setter
@AllArgsConstructor

View File

@@ -1,9 +1,10 @@
package app.module.core.config.adapters.web.rest.error;
import java.util.List;
import lombok.Builder;
import lombok.Data;
import java.util.List;
@Builder
@Data
public class RestErrorVO {

View File

@@ -1,9 +1,10 @@
package app.module.core.config.adapters.web.rest.response;
import java.util.List;
import lombok.Builder;
import lombok.Data;
import java.util.List;
@Builder
@Data
public class RestResponse<T> {

View File

@@ -1,11 +1,12 @@
package app.module.core.config.adapters.web.security.domain;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.util.List;
@Getter
@Setter
@NoArgsConstructor

View File

@@ -1,43 +0,0 @@
package app.module.core.config.adapters.web.security.domain;
import java.util.Collection;
import java.util.Map;
import lombok.Getter;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
@Getter
public class SocialUser extends DefaultOAuth2User {
private final String username;
private final String password;
private final boolean enabled;
private final boolean accountNonExpired;
private final boolean credentialsNonExpired;
private final boolean accountNonLocked;
private final String nickname;
private final long remainPasswordDays;
public SocialUser(
Collection<? extends GrantedAuthority> authorities,
Map<String, Object> attributes,
String nameAttributeKey,
String username,
String password,
boolean enabled,
boolean accountNonExpired,
boolean credentialsNonExpired,
boolean accountNonLocked,
String nickname,
long remainPasswordDays) {
super(authorities, attributes, nameAttributeKey);
this.username = username;
this.password = password;
this.enabled = enabled;
this.accountNonExpired = accountNonExpired;
this.credentialsNonExpired = credentialsNonExpired;
this.accountNonLocked = accountNonLocked;
this.nickname = nickname;
this.remainPasswordDays = remainPasswordDays;
}
}

View File

@@ -3,11 +3,12 @@ package app.module.core.config.adapters.web.security.entrypoint;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;
import java.io.IOException;
@Component
public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint {

View File

@@ -1,13 +1,14 @@
package app.module.core.config.application.aop;
import app.module.core.config.application.annotation.EscapeXSS;
import java.lang.reflect.Field;
import org.apache.commons.text.StringEscapeUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.stereotype.Component;
import java.lang.reflect.Field;
/**
* XSS 공격을 방지하기 위한 Aspect 클래스입니다.
*

View File

@@ -1,8 +1,5 @@
package app.module.core.config.application.component;
import java.io.IOException;
import java.util.Objects;
import java.util.Properties;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.core.env.PropertiesPropertySource;
import org.springframework.core.env.PropertySource;
@@ -10,6 +7,10 @@ import org.springframework.core.io.support.EncodedResource;
import org.springframework.core.io.support.PropertySourceFactory;
import org.springframework.lang.NonNull;
import java.io.IOException;
import java.util.Objects;
import java.util.Properties;
public class YamlPropertySourceFactory implements PropertySourceFactory {
@Override

View File

@@ -1,26 +0,0 @@
package app.module.core.config.application.converter;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
* RestController 응답시 LocalDateTime 필드 속성의 JSON 직렬화를 위해 선언됨.
*/
public class CustomLocalDateTimeSerializer extends JsonSerializer<LocalDateTime> {
private static final DateTimeFormatter formatter =
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
@Override
public void serialize(
LocalDateTime localDateTime,
JsonGenerator jsonGenerator,
SerializerProvider serializerProvider)
throws IOException {
jsonGenerator.writeString(formatter.format(localDateTime));
}
}

View File

@@ -1,18 +0,0 @@
package app.module.core.config.application.converter;
import java.time.LocalDateTime;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
import org.thymeleaf.util.StringUtils;
/**
* String 문자열을 LocalDateTime 으로 변환해주는 Converter. 현재 사용하지 않는다!
*/
@Component
public class StringToLocalDateTimeConverter implements Converter<String, LocalDateTime> {
@Override
public LocalDateTime convert(String source) {
return StringUtils.isEmpty(source) ? null : LocalDateTime.parse(source);
}
}

View File

@@ -1,9 +1,10 @@
package app.module.core.config.application.enums;
import java.util.Set;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import java.util.Set;
@Getter
@RequiredArgsConstructor
public enum AcceptableFileType {

View File

@@ -9,5 +9,4 @@ public enum DailyInputType {
* 영수증 입력
*/
OCR,
;
}

View File

@@ -6,13 +6,14 @@ import lombok.RequiredArgsConstructor;
@Getter
@RequiredArgsConstructor
public enum DailySort {
INCOME("수입"),
WORK("임업노동 투입"),
EXPENSE("지출"),
POWER("동력 사용시간"),
FORESTRY("임업생산물 중 자가소비량"),
FARMING("농업생산물 중 자가소비량"),
INCOME("수입", "수입"),
WORK("임업노동 투입", "임업노동 투입"),
EXPENSE("지출", "지출"),
POWER("동력 사용시간", "동력사용시간"),
FORESTRY("임업생산물 중 자가소비량", "자가임업 생산물 중 자가소비량"),
FARMING("농업생산물 중 자가소비량", "자가농업 생산물 중 자가소비량"),
;
private final String desc;
private final String desc2;
}

View File

@@ -13,5 +13,4 @@ public enum DailyStatus {
* 등록 완료
*/
DONE,
;
}

View File

@@ -13,5 +13,4 @@ public enum DailyTargetStatus {
* 대상 아님
*/
NONE,
;
}

View File

@@ -1,10 +1,11 @@
package app.module.core.config.application.enums;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Set;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import java.util.Set;
@Getter
@RequiredArgsConstructor
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -56,10 +57,16 @@ public enum FileUploadType {
AcceptableFileType.TXT,
AcceptableFileType.PDF,
AcceptableFileType.ZIP)),
RECEIPT(
INCOME(
Set.of(FileStorageType.SFTP,FileStorageType.LOCAL),
"/receipt",
"/income",
Set.of(
AcceptableFileType.IMAGE
)
),
EXPENSE(
Set.of(FileStorageType.SFTP,FileStorageType.LOCAL),
"/expense",
Set.of(
AcceptableFileType.IMAGE
)

View File

@@ -7,5 +7,5 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum SaveType {
CREATE,
UPDATE;
UPDATE
}

View File

@@ -6,8 +6,7 @@ import lombok.RequiredArgsConstructor;
@Getter
@RequiredArgsConstructor
public enum SignUpType {
NORMAL("일반 회원가입"),
SOCIAL("소셜 로그인 회원가입");
NORMAL("일반 회원가입");
private final String desc;
}

View File

@@ -1,15 +0,0 @@
package app.module.core.config.application.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@Getter
@RequiredArgsConstructor
public enum SocialType {
KAKAO("카카오 로그인", "kakao"),
NAVER("네이버 로그인", "naver"),
APPLE("애플 로그인", "apple");
private final String desc;
private final String registrationId;
}

View File

@@ -0,0 +1,49 @@
package app.module.core.config.application.logging;
import org.slf4j.Logger;
public class SafeLogger {
private final Logger logger;
public SafeLogger(Logger logger) { this.logger = logger; }
// 가변 인자 지원 및 CRLF 이스케이프 처리 유틸리티
private Object sanitizeForLog(Object arg) {
if (arg == null) return null;
String str = arg.toString();
return str.replace("\n", "\\n").replace("\r", "\\r");
}
public void info(String msg, Object... args) {
Object[] safeArgs = new Object[args.length];
for (int i = 0; i < args.length; i++) {
safeArgs[i] = sanitizeForLog(args[i]);
}
logger.info(msg, safeArgs);
}
public void error(String msg, Object... args) {
Object[] safeArgs = new Object[args.length];
for (int i = 0; i < args.length; i++) {
safeArgs[i] = sanitizeForLog(args[i]);
}
logger.error(msg, safeArgs);
}
public void warn(String msg, Object... args) {
Object[] safeArgs = new Object[args.length];
for (int i = 0; i < args.length; i++) {
safeArgs[i] = sanitizeForLog(args[i]);
}
logger.warn(msg, safeArgs);
}
public void debug(String msg, Object... args) {
Object[] safeArgs = new Object[args.length];
for (int i = 0; i < args.length; i++) {
safeArgs[i] = sanitizeForLog(args[i]);
}
logger.debug(msg, safeArgs);
}
}

View File

@@ -1,20 +1,20 @@
package app.module.core.config.application.util;
import java.nio.charset.StandardCharsets;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.Base64;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.nio.charset.StandardCharsets;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.Base64;
@Slf4j
@Component

View File

@@ -2,7 +2,7 @@ package app.module.core.config.application.util;
import app.module.core.config.adapters.persistence.component.AuditCommand;
public class AuditUtil {
public final class AuditUtil {
private AuditUtil() {}
public static <T extends AuditCommand> T create(T cmd) {

View File

@@ -1,8 +1,13 @@
package app.module.core.config.application.util;
import app.module.core.config.adapters.web.security.domain.SocialUser;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import java.io.File;
import java.io.IOException;
@@ -12,15 +17,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@Slf4j
public class CommonUtil {
@@ -88,14 +84,30 @@ public class CommonUtil {
if (principal instanceof UserDetails) {
username = ((UserDetails) principal).getUsername();
} else if (principal instanceof DefaultOAuth2User) {
SocialUser socialUser = (SocialUser) principal;
username = socialUser.getUsername();
}
return username;
}
public static String getLoginUserRole() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) {
return null;
}
Object principal = authentication.getPrincipal();
if (principal instanceof UserDetails) {
UserDetails userDetails = (UserDetails) principal;
if (!userDetails.getAuthorities().isEmpty()) {
return userDetails.getAuthorities().stream()
.map(auth -> auth.getAuthority())
.filter(authority -> authority != null && authority.startsWith("ROLE_"))
.findFirst()
.orElse(null);
}
}
return null;
}
public static HttpServletRequest getRequest() {
HttpServletRequest request = null;
if (RequestContextHolder.getRequestAttributes() != null) {

View File

@@ -4,8 +4,6 @@ import app.module.core.config.adapters.web.rest.error.RestErrorVO;
import app.module.core.config.adapters.web.rest.error.RestFieldErrorVO;
import app.module.core.config.adapters.web.rest.error.RestObjectErrorVO;
import app.module.core.usecase.uri.ancestry.ports.application.domain.URIAncestry;
import java.util.List;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -15,6 +13,9 @@ import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;
import org.thymeleaf.util.StringUtils;
import java.util.List;
import java.util.stream.Collectors;
@Component
@RequiredArgsConstructor
public class CoreUtil {

View File

@@ -1,5 +1,7 @@
package app.module.core.config.application.util;
import app.module.core.config.constants.DailyRecordConstants;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -9,6 +11,8 @@ import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@Slf4j
@@ -81,31 +85,28 @@ public class DailyUtil {
/**
* 데이터 수정 가능 여부
* [정책] 15일전까지 데이터 수정 가능(등록도 불가)
* @param startDate
* @param endDate
*
* @param startDate 시작일
* @param endDate 종료일
* @return true=수정 가능, false=수정 불가
*/
public boolean isModifiable(LocalDate startDate, LocalDate endDate) {
// TODO : 15일로 변경, 테스트를 위해 30일로 진행중
LocalDate limitStart = LocalDate.now().minusDays(30);
log.debug("isModifiable @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
LocalDate limitStart = LocalDate.now().minusDays(DailyRecordConstants.MODIFIY_LIMIT_DAY);
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
}
/**
* 데이터 등록 가능 여부
* @param startDate
* @param endDate
* @return
*
* @param startDate 시작일
* @param endDate 종료일
* @return true=등록 가능, false=등록 불가
*/
public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) {
// TODO : 15일로 변경, 테스트를 위해 60일로 진행중
LocalDate limitStart = LocalDate.now().minusDays(60);
log.debug("isRegisterPossible @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
LocalDate limitStart = LocalDate.now().minusDays(DailyRecordConstants.REGISTER_LIMIT_DAY);
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate));
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
}
/**
@@ -128,4 +129,35 @@ public class DailyUtil {
return new DecimalFormat("###,###").format(Double.parseDouble(value));
}
/**
* 농업 생산물의 UI Code 데이터의 수입부호, 지출부호 조회
*
* @param uiCodeList UI Code 목록
* @param targetCode 조회 코드
* @return 수입부호, 지출부호 Map
*/
public HashMap<String, String> getMarkByFarming(List<UICodeElement> uiCodeList, String targetCode) {
String incomeMark = null;
String expenseMark = null;
if (!"code.record.farming.self".equals(targetCode)) {
String returnValue = null;
for (UICodeElement codeSetup : uiCodeList) {
if (codeSetup.getId().equalsIgnoreCase(targetCode)) {
returnValue = codeSetup.getCodeValue();
break;
}
}
if (returnValue != null) {
incomeMark = returnValue.split(",")[0];
expenseMark = returnValue.split(",")[1];
}
}
HashMap<String, String> returnValue = new HashMap<>();
returnValue.put("incomeMark", incomeMark);
returnValue.put("expenseMark", expenseMark);
return returnValue;
}
}

View File

@@ -1,13 +1,6 @@
package app.module.core.config.application.util;
import jakarta.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.security.GeneralSecurityException;
import java.util.Arrays;
import java.util.Date;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.opc.OPCPackage;
@@ -21,6 +14,14 @@ import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.security.GeneralSecurityException;
import java.util.Arrays;
import java.util.Date;
@Component
@Slf4j
public class ExcelUtil {
@@ -98,7 +99,7 @@ public class ExcelUtil {
wb.write(responseOutputStream);
wb.close();
} catch (IOException e) {
e.printStackTrace();
log.error("[ExcelUtil] generateWithoutPassword: {}", e.getMessage(), e);
}
}
}

View File

@@ -1,12 +1,10 @@
package app.module.core.config.application.util;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import javax.imageio.ImageIO;
/**
* 이미지 crop 과 resize http://egloos.zum.com/kingori/v/4486279

View File

@@ -1,6 +1,9 @@
package app.module.core.config.application.util;
import app.module.core.usecase.file.getFile.adapters.persistence.GetFileMapper;
import app.module.core.usecase.file.getFile.ports.application.domain.GetFile;
import app.module.core.usecase.file.saveToStorage.ports.application.strategy.SftpConnector;
import app.module.core.usecase.file.updateFile.adapters.persistence.UpdateFileMapper;
import app.module.core.usecase.file.updateFile.ports.application.domain.UploadFileDto;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.JSchException;
@@ -18,6 +21,8 @@ import java.nio.file.Paths;
public class SftpFileDeleteUtil {
private final SftpConnector sftpConnector;
private final GetFileMapper getFileMapper;
private final UpdateFileMapper updateFileMapper;
@Value("${path.upload.sftp.public}")
private String publicPath;
@@ -64,6 +69,47 @@ public class SftpFileDeleteUtil {
}
}
public void deleteRealFile(Long deleteFileId) throws JSchException, SftpException {
GetFile deleteFile = getFileMapper.findById(deleteFileId).orElseThrow();
updateFileMapper.deleteReceiptFile(deleteFileId,CommonUtil.getLoginUsername());
if (deleteFile == null || deleteFile.getPath() == null || deleteFile.getName() == null) {
log.error("Invalid file information: {}", deleteFile);
throw new IllegalArgumentException("Invalid file information");
}
// 경로 검증 및 생성
String filePath = constructSafeFilePath(deleteFile.getPath(), deleteFile.getName());
log.info("Attempting to delete file from SFTP: {}", filePath);
// SFTP 연결 확인 및 재연결
if (!sftpConnector.isConnected()) {
log.warn("SFTP connection lost, attempting to reconnect");
sftpConnector.connect();
}
ChannelSftp channelSftp = sftpConnector.getChannelSftp();
if (channelSftp == null) {
log.error("SFTP channel is not initialized");
throw new SftpException(ChannelSftp.SSH_FX_NO_CONNECTION, "SFTP channel is not initialized");
}
// 파일 삭제
try {
channelSftp.stat(filePath); // 파일 존재 여부 확인
channelSftp.rm(filePath);
log.info("File deleted successfully from SFTP: {}", filePath);
} catch (SftpException e) {
if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
log.warn("File does not exist on SFTP: {}", filePath);
} else {
log.error("Failed to delete file from SFTP: {}, error: {}", filePath, e.getMessage(), e);
throw e;
}
}
}
/**
* 경로 조작 방지를 위해 안전한 파일 경로 생성
*/

View File

@@ -1,6 +1,6 @@
package app.module.core.config.constants;
public class CommonConstants {
public final class CommonConstants {
private CommonConstants() {
throw new IllegalAccessError("어플리케이션에서 공통으로 사용되는 상수 클래스로 생성자를 사용할 수 없습니다.");
}
@@ -14,4 +14,26 @@ public class CommonConstants {
* 작업 면적의 직접입력 코드
*/
public static final String AREA_CODE_OTHER = "code.record.area.self";
/**
* 관리자 아이디 생성 규칙
* [정책] 아이디: 4~15자, 영문/숫자/한글/특수문자(_,-) 허용
*/
public static final String ADMIN_ID_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$";
/**
* 관리자 아이디 유효성 실패 메시지
*/
public static final String ADMIN_ID_MSG = "아이디는 4~15자, 영문/숫자/한글/특수문자(_,-)만 가능합니다.";
/**
* 관리자 비밀번호 생성 규칙
* [정책] 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상
*/
public static final String ADMIN_PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_-])[a-zA-Z0-9가-힣!@#$%_-]{5,15}$";
/**
* 관리자 비밀번호 유효성 실패 메시지
*/
public static final String ADMIN_PASSWORD_MSG = "비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다.";
}

View File

@@ -1,6 +1,6 @@
package app.module.core.config.constants;
public class DailyRecordConstants {
public final class DailyRecordConstants {
private DailyRecordConstants() {
throw new IllegalAccessError("어플리케이션에서 일계부에서 사용되는 상수 클래스로 생성자를 사용할 수 없습니다.");
}
@@ -16,4 +16,34 @@ public class DailyRecordConstants {
* [정책] 외상판매 Y 일 경우 지출부호 91206 적재
*/
public static final String INCOME_EXPENSE_MARK = "91206";
/**
* 지출의 유형
* [정책] 2 고정
*/
public static final String EXPENSE_CATEGORY = "2";
/**
* 지출의 수입부호
* [정책] 외상판매 Y 일 경우 수입부호 52210 적재
*/
public static final String EXPENSE_INCOME_MARK = "52210";
/**
* 임업생산물의 지출부호
* [정책] 81011 고정
*/
public static final String FORESTRY_EXPENSE_MARK = "81011";
/**
* 일계부 등록 가능 일
* [정책] 15일전까지 데이터 등록 가능
*/
public static final int REGISTER_LIMIT_DAY = 15;
/**
* 일계부 수정 가능 일
* [정책] 15일전까지 데이터 수정 가능
*/
public static final int MODIFIY_LIMIT_DAY = 15;
}

View File

@@ -1,6 +1,7 @@
package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence;
import app.module.core.config.application.util.AuditUtil;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.admin.checkAdminId.persistence.CheckAdminIdMapper;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelAdminCreateVO;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
@@ -12,6 +13,7 @@ import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +26,8 @@ import java.util.List;
@Component
@RequiredArgsConstructor
class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
@Value("${spring.profiles.active}")
private String activeProfiles;
private final CheckAdminIdMapper checkAdminIdMapper;
private final SaveAdminMapper saveAdminMapper;
@@ -37,7 +41,7 @@ class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
Workbook workbook = WorkbookFactory.create(file.getInputStream());
Sheet sheet = workbook.getSheetAt(0);
Integer success = 0;
List<UICodeElement> uiCodeElementList = uiCodeListMapper.findByParentId("code.region.main");
List<UICodeElement> uiCodeElementList = uiCodeListMapper.findByParentId("code.region.main", CommonUtil.getLoginUserRole(),activeProfiles);
// 첫 번째 행은 헤더로 간주하고 스킵
for (int i = 1; i <= sheet.getLastRowNum(); i++) {
Row row = sheet.getRow(i);
@@ -76,7 +80,7 @@ class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
}
workbook.close();
return new ExcelResultVO(sheet.getLastRowNum()-1 , success);
return new ExcelResultVO(sheet.getLastRowNum() , success);
}
// 셀 값을 문자열로 변환

View File

@@ -2,6 +2,7 @@ package app.module.core.usecase.admin.excelSaveAdmin.ports;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
public interface ExcelSaveAdminPortIn {

View File

@@ -3,7 +3,6 @@ package app.module.core.usecase.admin.excelSaveAdmin.ports.application;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortIn;
import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortOut;
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

View File

@@ -1,22 +1,19 @@
package app.module.core.usecase.admin.getAdmins.adapters.persistence;
import app.module.core.config.adapters.persistence.repository.AdminRepo;
import app.module.core.usecase.admin.getAdmins.adapters.persistence.model.GetAdminsDto;
import app.module.core.usecase.admin.getAdmins.ports.GetAdminsPortOut;
import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdmins;
import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsCmd;
import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsRole;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.collections4.ListUtils;
import org.springframework.data.domain.PageImpl;
import org.springframework.transaction.annotation.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.stream.Collectors;
@Repository
@RequiredArgsConstructor

View File

@@ -1,14 +1,14 @@
package app.module.core.usecase.admin.getAdmins.adapters.persistence;
import app.module.core.usecase.admin.getAdmins.adapters.persistence.model.GetAdminsDto;
import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdmins;
import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsCmd;
import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsRole;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
@Mapper
public interface GetAdminsMapper {
List<GetAdminsDto> findAll(@Param("cmd") GetAdminsCmd cmd, @Param("pageable") Pageable pageable);

View File

@@ -1,9 +1,10 @@
package app.module.core.usecase.admin.getAdmins.adapters.persistence.model;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@Getter
@Setter
public class GetAdminsDto {

View File

@@ -1,12 +1,13 @@
package app.module.core.usecase.admin.getAdmins.ports.application.domain;
import app.module.core.config.application.component.AuditOutput;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
import java.util.List;
@Getter
@NoArgsConstructor
@AllArgsConstructor

View File

@@ -1,11 +1,12 @@
package app.module.core.usecase.admin.getAdmins.ports.application.domain;
import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.io.Serializable;
@Getter
@Setter
@NoArgsConstructor

View File

@@ -1,12 +1,13 @@
package app.module.core.usecase.admin.getAdmins.ports.application.domain;
import java.io.Serializable;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.io.Serializable;
import java.util.List;
@Getter
@Setter
@NoArgsConstructor

View File

@@ -3,10 +3,11 @@ package app.module.core.usecase.admin.removeAdmin.adapters.persistence;
import app.module.core.config.application.util.AuditUtil;
import app.module.core.usecase.admin.removeAdmin.adapters.persistence.model.RemoveAdminParam;
import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortOut;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
@RequiredArgsConstructor
class RemoveAdminDao implements RemoveAdminPortOut {

View File

@@ -1,12 +1,12 @@
package app.module.core.usecase.admin.removeAdmin.adapters.persistence.model;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
@Getter
@Setter
@AllArgsConstructor

View File

@@ -2,10 +2,11 @@ package app.module.core.usecase.admin.removeAdmin.ports.application;
import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortIn;
import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortOut;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
@RequiredArgsConstructor
class RemoveAdminService implements RemoveAdminPortIn {

View File

@@ -7,7 +7,6 @@ import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut;
import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd;
import app.module.core.usecase.admin.view.adapters.persistence.AdminViewMapper;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

View File

@@ -1,7 +1,6 @@
package app.module.core.usecase.admin.saveAdmin.adapters.persistence.model;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,8 +1,6 @@
package app.module.core.usecase.admin.saveAdmin.adapters.persistence.model;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;

View File

@@ -5,12 +5,13 @@ import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut;
import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.thymeleaf.util.StringUtils;
import java.time.LocalDateTime;
@Service
@RequiredArgsConstructor
public class SaveAdminService implements SaveAdminPortIn {

View File

@@ -1,12 +1,12 @@
package app.module.core.usecase.admin.saveAdmin.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@Getter
@Setter
@AllArgsConstructor

View File

@@ -3,12 +3,12 @@ package app.module.core.usecase.admin.status.adapters.persistence;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.admin.status.adapters.persistence.model.AdminUpdateAccountLockParam;
import app.module.core.usecase.admin.status.ports.AdminUpdateAccountLockPortOut;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.cglib.core.Local;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
@Repository
@RequiredArgsConstructor
public class AdminUpdateAccountLockDao implements AdminUpdateAccountLockPortOut {

View File

@@ -3,11 +3,12 @@ package app.module.core.usecase.admin.status.adapters.persistence;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.admin.status.adapters.persistence.model.AdminUpdateLoginFailParam;
import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortOut;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
@Repository
@RequiredArgsConstructor
public class AdminUpdateLoginFailDao implements AdminUpdateLoginFailPortOut {

View File

@@ -1,9 +1,9 @@
package app.module.core.usecase.admin.status.adapters.persistence.model;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@Getter
@AllArgsConstructor

View File

@@ -1,9 +1,9 @@
package app.module.core.usecase.admin.status.adapters.persistence.model;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.apache.ibatis.annotations.Mapper;
import java.time.LocalDateTime;
@Getter
@AllArgsConstructor

View File

@@ -2,11 +2,12 @@ package app.module.core.usecase.admin.view.adapters.persistence;
import app.module.core.usecase.admin.view.ports.AdminViewPortOut;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
@Repository
@RequiredArgsConstructor
class AdminViewDao implements AdminViewPortOut {

View File

@@ -2,10 +2,10 @@ package app.module.core.usecase.admin.view.adapters.persistence;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import java.util.List;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper;
import java.util.Optional;
@Mapper
public interface AdminViewMapper {
Optional<AdminView> findById(String id);

View File

@@ -1,11 +1,12 @@
package app.module.core.usecase.admin.view.adapters.persistence.model;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.time.LocalDateTime;
@Data
@AllArgsConstructor
@NoArgsConstructor

View File

@@ -1,6 +1,7 @@
package app.module.core.usecase.admin.view.ports;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import java.util.Optional;
public interface AdminViewPortIn {

View File

@@ -1,6 +1,7 @@
package app.module.core.usecase.admin.view.ports;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import java.util.Optional;
public interface AdminViewPortOut {

View File

@@ -3,10 +3,11 @@ package app.module.core.usecase.admin.view.ports.application;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import app.module.core.usecase.admin.view.ports.AdminViewPortOut;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Optional;
@Service
@RequiredArgsConstructor
class AdminViewService implements AdminViewPortIn {

View File

@@ -1,13 +1,13 @@
package app.module.core.usecase.admin.view.ports.application.domain;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.time.LocalDateTime;
@Data
@AllArgsConstructor
@NoArgsConstructor

View File

@@ -1,11 +1,12 @@
package app.module.core.usecase.admin.view.ports.application.domain;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
@Getter
@Setter
@AllArgsConstructor

View File

@@ -1,11 +1,12 @@
package app.module.core.usecase.admin.view.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor

View File

@@ -1,36 +0,0 @@
package app.module.core.usecase.article.comment.createArticleComment.adapters.persistence;
import app.module.core.config.adapters.persistence.entity.ArticleComment;
import app.module.core.usecase.article.comment.createArticleComment.ports.CreateArticleCommentPortOut;
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleComment;
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleCommentCmd;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class CreateArticleCommentDao implements CreateArticleCommentPortOut {
private final CreateArticleCommentMapper mapper;
@Override
public Optional<CreateArticleComment> operate(CreateArticleCommentCmd command) {
ArticleComment articleComment = new ArticleComment(
null,
command.getContent(),
command.getArticleId()
);
mapper.insertArticleComment(articleComment);
return Optional.of(
new CreateArticleComment(
articleComment.getId(),
articleComment.getContent(),
articleComment.getCreatedBy(),
articleComment.getUpdatedAt()
));
}
}

View File

@@ -1,9 +0,0 @@
package app.module.core.usecase.article.comment.createArticleComment.adapters.persistence;
import app.module.core.config.adapters.persistence.entity.ArticleComment;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CreateArticleCommentMapper {
void insertArticleComment(ArticleComment articleComment);
}

View File

@@ -1,10 +0,0 @@
package app.module.core.usecase.article.comment.createArticleComment.ports;
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleComment;
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleCommentCmd;
import java.util.Optional;
public interface CreateArticleCommentPortIn {
Optional<CreateArticleComment> operate(CreateArticleCommentCmd command);
}

Some files were not shown because too many files have changed in this diff Show More