diff --git a/build.gradle b/build.gradle index c341f0c2..6f5ab4f1 100644 --- a/build.gradle +++ b/build.gradle @@ -12,10 +12,24 @@ configurations { compileOnly { extendsFrom annotationProcessor } + all { + exclude group: 'ch.qos.logback', module: 'logback-classic' + exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j' + } } repositories { + mavenLocal() mavenCentral() + maven { + url "https://maven.egovframe.kr:8080/maven/" + } + maven { + url "https://maven.egovframe.go.kr/maven/" + metadataSources { + artifact() + } + } } dependencies { @@ -41,6 +55,10 @@ dependencies { implementation 'com.oracle.database.jdbc:ojdbc8:21.7.0.0' implementation files('libs/tibero6-jdbc.jar') + /*전자정부*/ + implementation(group: 'org.egovframe.rte', name: 'org.egovframe.rte.ptl.mvc', version:'4.1.0') { + exclude(module: 'commons-logging') + } // json implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1' diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index f9ee2472..b56f94b8 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -20,11 +20,13 @@ import com.dbnt.faisp.main.userInfo.service.UserAlarmService; import com.dbnt.faisp.main.userInfo.service.UserLogService; import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; +import org.egovframe.rte.fdl.cmmn.trace.LeaveaTrace; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.util.List; @@ -45,6 +47,10 @@ public class BaseController { private final AuthMgtService authMgtService; private final UserLogService userLogService; + /** TRACE */ + @Resource(name = "leaveaTrace") + LeaveaTrace leaveaTrace; + @GetMapping("/") public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) { ModelAndView mav = null; diff --git a/src/main/java/com/dbnt/faisp/config/BaseService.java b/src/main/java/com/dbnt/faisp/config/BaseService.java index dbbb0e9f..2d879708 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseService.java +++ b/src/main/java/com/dbnt/faisp/config/BaseService.java @@ -1,6 +1,7 @@ package com.dbnt.faisp.config; import lombok.RequiredArgsConstructor; +import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -10,7 +11,7 @@ import java.io.IOException; @Service @RequiredArgsConstructor -public class BaseService { +public class BaseService extends EgovAbstractServiceImpl { @Value("${spring.servlet.multipart.location}") protected String locationPath; diff --git a/src/main/java/com/dbnt/faisp/config/EditorController.java b/src/main/java/com/dbnt/faisp/config/EditorController.java index 11f8dcfc..4c6d7fb7 100644 --- a/src/main/java/com/dbnt/faisp/config/EditorController.java +++ b/src/main/java/com/dbnt/faisp/config/EditorController.java @@ -35,7 +35,7 @@ import javax.servlet.http.HttpSession; @RestController @RequiredArgsConstructor -public class EditorController extends BaseService{ +public class EditorController{ @Value("${site.domain}") protected String siteDomain; @@ -43,6 +43,10 @@ public class EditorController extends BaseService{ @Value("${editor.img.view}") protected String imgView; + @Value("${spring.servlet.multipart.location}") + protected String locationPath; + @Value("${file.dir.editor}") + protected String editorPath; @PostMapping("/Crosseditor/uploadImg") public @ResponseBody JSONObject uploadImg(Model model, HttpServletRequest request, HttpServletResponse response, HttpSession session) { diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index 96d660aa..99584dbc 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -33,6 +33,7 @@ import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import ognl.Ognl; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; @@ -60,8 +61,15 @@ import java.util.zip.ZipOutputStream; @RestController @RequiredArgsConstructor @RequestMapping("/file") -public class FileController extends BaseService{ +public class FileController{ + @Value("${spring.servlet.multipart.location}") + protected String locationPath; + @Value("${file.dir.editor}") + protected String editorPath; + @Value("${file.dir.affairTemp}") + protected String affairTempPath; + private final FaRptService faRptService; private final PlanService planService; private final PublicBoardService publicBoardService; diff --git a/src/main/java/com/dbnt/faisp/egovframe/com/cmm/EgovComTraceHandler.java b/src/main/java/com/dbnt/faisp/egovframe/com/cmm/EgovComTraceHandler.java new file mode 100644 index 00000000..7a765698 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/egovframe/com/cmm/EgovComTraceHandler.java @@ -0,0 +1,31 @@ +package com.dbnt.faisp.egovframe.com.cmm; + +import lombok.extern.slf4j.Slf4j; +import org.egovframe.rte.fdl.cmmn.trace.handler.TraceHandler; + +/** + * @Class Name : EgovComTraceHandler.java + * @Description : 공통서비스의 trace 처리 클래스 + * @Modification Information + * + * 수정일 수정자 수정내용 + * ------- ------- ------------------- + * 2011. 09. 30. JJY + * + * @author JJY + * @since 2011. 9. 30. + * + */ +@Slf4j +public class EgovComTraceHandler implements TraceHandler { + + /** + * 발생된 메시지를 출력한다. + */ + public void todo(Class> clazz, String message) { + //log.debug("log ==> DefaultTraceHandler run..............."); + log.debug("[TRACE]CLASS::: {}", clazz.getName()); + log.debug("[TRACE]MESSAGE::: {}", message); + //이곳에서 후속처리로 필요한 액션을 취할 수 있다. + } +} diff --git a/src/main/java/com/dbnt/faisp/egovframe/com/config/EgovConfigAppCommon.java b/src/main/java/com/dbnt/faisp/egovframe/com/config/EgovConfigAppCommon.java new file mode 100644 index 00000000..633f646e --- /dev/null +++ b/src/main/java/com/dbnt/faisp/egovframe/com/config/EgovConfigAppCommon.java @@ -0,0 +1,87 @@ +package com.dbnt.faisp.egovframe.com.config; + +import com.dbnt.faisp.egovframe.com.cmm.EgovComTraceHandler; +import org.egovframe.rte.fdl.cmmn.trace.LeaveaTrace; +import org.egovframe.rte.fdl.cmmn.trace.handler.TraceHandler; +import org.egovframe.rte.fdl.cmmn.trace.manager.DefaultTraceHandleManager; +import org.egovframe.rte.fdl.cmmn.trace.manager.TraceHandlerService; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.stereotype.Controller; +import org.springframework.stereotype.Repository; +import org.springframework.stereotype.Service; +import org.springframework.util.AntPathMatcher; + +import java.util.HashMap; +import java.util.Map; + +/** + * @ClassName : EgovConfigAppCommon.java + * @Description : 공통 Bean 설정 + * + * @author : 윤주호 + * @since : 2021. 7. 20 + * @version : 1.0 + * + *
+ * << 개정이력(Modification Information) >> + * + * 수정일 수정자 수정내용 + * ------------- ------------ --------------------- + * 2021. 7. 20 윤주호 최초 생성 + * 2023. 5. 05 crlee remove EgovMessageSource config + *+ * + */ +@Configuration +@ComponentScan(basePackages = "com.dbnt.faisp", includeFilters = { + @ComponentScan.Filter(type = FilterType.ANNOTATION, value = Service.class), + @ComponentScan.Filter(type = FilterType.ANNOTATION, value = Repository.class) +}, excludeFilters = { + @ComponentScan.Filter(type = FilterType.ANNOTATION, value = Controller.class), + @ComponentScan.Filter(type = FilterType.ANNOTATION, value = Configuration.class) +}) +public class EgovConfigAppCommon { + + /** + * @return AntPathMatcher 등록. Ant 경로 패턴 경로와 일치하는지 여부를 확인 + */ + @Bean + public AntPathMatcher antPathMatcher() { + return new AntPathMatcher(); + } + + + /** + * @return [LeaveaTrace 설정] defaultTraceHandler 등록 + */ + @Bean + public EgovComTraceHandler defaultTraceHandler() { + return new EgovComTraceHandler(); + } + + /** + * @return [LeaveaTrace 설정] traceHandlerService 등록. TraceHandler 설정 + */ + @Bean + public DefaultTraceHandleManager traceHandlerService() { + DefaultTraceHandleManager defaultTraceHandleManager = new DefaultTraceHandleManager(); + defaultTraceHandleManager.setReqExpMatcher(antPathMatcher()); + defaultTraceHandleManager.setPatterns(new String[] {"*"}); + defaultTraceHandleManager.setHandlers(new TraceHandler[] {defaultTraceHandler()}); + return defaultTraceHandleManager; + } + + /** + * @return [LeaveaTrace 설정] LeaveaTrace 등록 + */ + @Bean + public LeaveaTrace leaveaTrace() { + LeaveaTrace leaveaTrace = new LeaveaTrace(); + leaveaTrace.setTraceHandlerServices(new TraceHandlerService[] {traceHandlerService()}); + return leaveaTrace; + } + +} diff --git a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java index b9b628b9..5be60376 100644 --- a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java +++ b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java @@ -7,6 +7,7 @@ import com.dbnt.faisp.main.userInfo.model.UserCareer; import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.main.userInfo.repository.UserCareerRepository; import lombok.RequiredArgsConstructor; +import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,7 +19,7 @@ import java.util.List; @Service @RequiredArgsConstructor -public class KwmsService { +public class KwmsService extends EgovAbstractServiceImpl { private final VEmployeeRepository vEmployeeRepository; private final CodeMgtService codeMgtService; private final UserCareerRepository careerRepository; diff --git a/src/main/java/com/dbnt/faisp/main/authMgt/service/AuthMgtService.java b/src/main/java/com/dbnt/faisp/main/authMgt/service/AuthMgtService.java index a92d6110..18ef585d 100644 --- a/src/main/java/com/dbnt/faisp/main/authMgt/service/AuthMgtService.java +++ b/src/main/java/com/dbnt/faisp/main/authMgt/service/AuthMgtService.java @@ -7,6 +7,7 @@ import com.dbnt.faisp.main.authMgt.model.AuthMgt; import com.dbnt.faisp.main.authMgt.repository.AccessConfigRepository; import com.dbnt.faisp.main.authMgt.repository.ApprovalConfigRepository; import lombok.RequiredArgsConstructor; +import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -17,7 +18,7 @@ import java.util.Map; @Service @RequiredArgsConstructor -public class AuthMgtService { +public class AuthMgtService extends EgovAbstractServiceImpl { private final AuthMgtMapper authMgtMapper; private final AccessConfigRepository accessConfigRepository; private final ApprovalConfigRepository approvalConfigRepository; diff --git a/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java b/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java index e03dec17..bf8e02fa 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java +++ b/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java @@ -11,6 +11,7 @@ import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; +import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,7 +24,7 @@ import java.util.*; @Service @Transactional @RequiredArgsConstructor -public class BudgetService { +public class BudgetService extends EgovAbstractServiceImpl { private final TblBudgetCodeL1Repository codeL1Repository; private final TblBudgetCodeL2Repository codeL2Repository; diff --git a/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java index 8c884151..a1b63cf2 100644 --- a/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java +++ b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java @@ -6,6 +6,7 @@ import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import com.dbnt.faisp.main.codeMgt.repository.CodeCatgRepository; import com.dbnt.faisp.main.codeMgt.repository.CodeMgtRepository; import lombok.RequiredArgsConstructor; +import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -13,7 +14,7 @@ import java.util.*; @Service @RequiredArgsConstructor -public class CodeMgtService{ +public class CodeMgtService extends EgovAbstractServiceImpl { private final CodeMgtRepository codeMgtRepository; private final CodeCatgRepository codeCatgRepository; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java index e0723987..538603a5 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java @@ -4,13 +4,12 @@ package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.mapper; import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.IcaStatistics; import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; -import com.dbnt.faisp.util.ParamMap; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface InternationalCrimeArrestMapper{ +public interface InternationalCrimeArrestMapper { List