diff --git a/db/FIMS_v0.1.erwin b/db/FIMS_v0.1.erwin deleted file mode 100644 index d4d9f621..00000000 Binary files a/db/FIMS_v0.1.erwin and /dev/null differ diff --git a/db/FIMS_v0.2.erwin b/db/FIMS_v0.2.erwin deleted file mode 100644 index 5990d5f1..00000000 Binary files a/db/FIMS_v0.2.erwin and /dev/null differ diff --git a/db/FIMS_v0.3.erwin b/db/FIMS_v0.3.erwin deleted file mode 100644 index bccde3dd..00000000 Binary files a/db/FIMS_v0.3.erwin and /dev/null differ diff --git a/db/FIMS_v0.4.erwin b/db/FIMS_v0.4.erwin deleted file mode 100644 index 1a8ea8c2..00000000 Binary files a/db/FIMS_v0.4.erwin and /dev/null differ diff --git a/db/FIMS_v0.5.erwin b/db/FIMS_v0.5.erwin deleted file mode 100644 index 3d9e2d2a..00000000 Binary files a/db/FIMS_v0.5.erwin and /dev/null differ diff --git a/db/Schema.xml b/db/Schema.xml deleted file mode 100644 index 3075f9f7..00000000 --- a/db/Schema.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/db/name.nsm b/db/name.nsm deleted file mode 100644 index 50bf6ad4..00000000 Binary files a/db/name.nsm and /dev/null differ diff --git a/db/sql/DML.sql b/db/sql/DML.sql deleted file mode 100644 index ddf63b69..00000000 --- a/db/sql/DML.sql +++ /dev/null @@ -1,32 +0,0 @@ -CREATE TABLE `tb_key_sequence` ( - `seq_name` varchar(3) NOT NULL COMMENT '시퀀스 prefix', - `seq_no` int NOT NULL COMMENT '시퀀스 no', - PRIMARY KEY (`seq_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='tb_key_sequence'; - - - -CREATE FUNCTION `fn_get_key_seq`(`p_seq_name` VARCHAR(3), `p_key_length` int) - RETURNS varchar(20) CHARSET utf8 -BEGIN - DECLARE RTN_VAL VARCHAR(20); - - INSERT INTO tb_key_sequence (seq_name, seq_no) - values (p_seq_name, LAST_INSERT_ID(1)) - ON DUPLICATE KEY UPDATE seq_no=LAST_INSERT_ID(seq_no+1); - - set @ret = row_count(); - - if @ret = 0 then - set RTN_VAL = '0'; - else - SET RTN_VAL = (SELECT TRIM(CONCAT(p_seq_name, LPAD(LAST_INSERT_ID(),p_key_length,'0')))); - end if; - - RETURN RTN_VAL; -END ; - - - - - diff --git a/db/sql/index.sql b/db/sql/index.sql deleted file mode 100644 index 48bf1615..00000000 --- a/db/sql/index.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE UNIQUE INDEX uix_tb_cmm_file_mastr_01 - ON tb_cmm_file_mastr (inf_type, inf_key); - diff --git a/db/xit1.xml b/db/xit1.xml deleted file mode 100644 index 3e1e4296..00000000 --- a/db/xit1.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/pom.xml b/pom.xml index 8af80a43..a5b23b75 100644 --- a/pom.xml +++ b/pom.xml @@ -9,13 +9,6 @@ fims http://www.xit.co.kr - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - UTF-8 17 @@ -891,6 +884,12 @@ jasypt-spring31 1.9.3 + + org.projectlombok + lombok + 1.18.22 + compile + diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/code/XitDetailCodeMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/code/XitDetailCodeMngVO.java index df65969d..e64954ee 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/code/XitDetailCodeMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/code/XitDetailCodeMngVO.java @@ -1,6 +1,6 @@ package kr.xit.fims.framework.biz.mng.code; -import io.swagger.annotations.ApiParam; + import lombok.*; /** @@ -30,31 +30,31 @@ public class XitDetailCodeMngVO { /* * 코드ID */ - @ApiParam(value = "코드 ID", required = true) + private String grpId; /* * 코드ID명 */ - @ApiParam(value = "코드 ID 이름") + private String grpNm; /* * 코드 */ - @ApiParam(value = "코드") + private String code; /* * 코드명 */ - @ApiParam(value = "코드 이름") + private String codeVal; /* * 코드설명 */ - @ApiParam(value = "코드 설명") + private String dscrp; private String etc1; diff --git a/src/main/resources/spring/service/context-aspect.xml b/src/main/resources/spring/context-aspect.xml similarity index 100% rename from src/main/resources/spring/service/context-aspect.xml rename to src/main/resources/spring/context-aspect.xml diff --git a/src/main/resources/spring/service/context-beans.xml b/src/main/resources/spring/context-beans.xml similarity index 100% rename from src/main/resources/spring/service/context-beans.xml rename to src/main/resources/spring/context-beans.xml diff --git a/src/main/resources/spring/service/context-common.xml b/src/main/resources/spring/context-common.xml similarity index 100% rename from src/main/resources/spring/service/context-common.xml rename to src/main/resources/spring/context-common.xml diff --git a/src/main/resources/spring/service/context-datasource.xml b/src/main/resources/spring/context-datasource.xml similarity index 100% rename from src/main/resources/spring/service/context-datasource.xml rename to src/main/resources/spring/context-datasource.xml diff --git a/src/main/resources/spring/service/cache/context-ehcache.xml b/src/main/resources/spring/context-ehcache.xml similarity index 88% rename from src/main/resources/spring/service/cache/context-ehcache.xml rename to src/main/resources/spring/context-ehcache.xml index cca20016..d320d75f 100644 --- a/src/main/resources/spring/service/cache/context-ehcache.xml +++ b/src/main/resources/spring/context-ehcache.xml @@ -16,7 +16,7 @@ multi-node시 shared=true property 필요 - 싱글노드시 불필요 --> - + diff --git a/src/main/resources/spring/service/context-excel.xml b/src/main/resources/spring/context-excel.xml similarity index 100% rename from src/main/resources/spring/service/context-excel.xml rename to src/main/resources/spring/context-excel.xml diff --git a/src/main/resources/spring/service/context-freemaker.xml b/src/main/resources/spring/context-freemaker.xml similarity index 100% rename from src/main/resources/spring/service/context-freemaker.xml rename to src/main/resources/spring/context-freemaker.xml diff --git a/src/main/resources/spring/service/context-idgen-xit.xml b/src/main/resources/spring/context-idgen-xit.xml similarity index 100% rename from src/main/resources/spring/service/context-idgen-xit.xml rename to src/main/resources/spring/context-idgen-xit.xml diff --git a/src/main/resources/spring/service/context-mail.xml b/src/main/resources/spring/context-mail.xml similarity index 100% rename from src/main/resources/spring/service/context-mail.xml rename to src/main/resources/spring/context-mail.xml diff --git a/src/main/resources/spring/service/context-mapper.xml b/src/main/resources/spring/context-mapper.xml similarity index 100% rename from src/main/resources/spring/service/context-mapper.xml rename to src/main/resources/spring/context-mapper.xml diff --git a/src/main/resources/spring/context-mvc.xml b/src/main/resources/spring/context-mvc.xml index 02057e8f..12637a81 100644 --- a/src/main/resources/spring/context-mvc.xml +++ b/src/main/resources/spring/context-mvc.xml @@ -25,11 +25,10 @@ allow-credentials="true" max-age="3600" /> - - - - - + + + + diff --git a/src/main/resources/spring/service/context-properties.xml b/src/main/resources/spring/context-properties.xml similarity index 100% rename from src/main/resources/spring/service/context-properties.xml rename to src/main/resources/spring/context-properties.xml diff --git a/src/main/resources/spring/service/context-scan.xml b/src/main/resources/spring/context-scan.xml similarity index 96% rename from src/main/resources/spring/service/context-scan.xml rename to src/main/resources/spring/context-scan.xml index 9e0fa8a4..2cc7f20a 100644 --- a/src/main/resources/spring/service/context-scan.xml +++ b/src/main/resources/spring/context-scan.xml @@ -6,7 +6,6 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"> - diff --git a/src/main/resources/spring/service/context-scheduling-sym-log-lgm.xml b/src/main/resources/spring/context-scheduling-sym-log-lgm.xml similarity index 100% rename from src/main/resources/spring/service/context-scheduling-sym-log-lgm.xml rename to src/main/resources/spring/context-scheduling-sym-log-lgm.xml diff --git a/src/main/resources/spring/service/context-scheduling.xml b/src/main/resources/spring/context-scheduling.xml similarity index 100% rename from src/main/resources/spring/service/context-scheduling.xml rename to src/main/resources/spring/context-scheduling.xml diff --git a/src/main/resources/spring/service/context-security.xml b/src/main/resources/spring/context-security.xml similarity index 100% rename from src/main/resources/spring/service/context-security.xml rename to src/main/resources/spring/context-security.xml diff --git a/src/main/resources/spring/context-service.xml b/src/main/resources/spring/context-service.xml index fe62bfb7..55d89a47 100644 --- a/src/main/resources/spring/context-service.xml +++ b/src/main/resources/spring/context-service.xml @@ -3,25 +3,25 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - - + + + + - - - - - - - - - + + + + + + + + + - - - + + + diff --git a/src/main/resources/spring/context-sqlMap.xml b/src/main/resources/spring/context-sqlMap.xml new file mode 100644 index 00000000..14c80760 --- /dev/null +++ b/src/main/resources/spring/context-sqlMap.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/main/resources/spring/service/context-syslogaop.xml b/src/main/resources/spring/context-syslogaop.xml similarity index 100% rename from src/main/resources/spring/service/context-syslogaop.xml rename to src/main/resources/spring/context-syslogaop.xml diff --git a/src/main/resources/spring/service/context-transaction.xml b/src/main/resources/spring/context-transaction.xml similarity index 100% rename from src/main/resources/spring/service/context-transaction.xml rename to src/main/resources/spring/context-transaction.xml diff --git a/src/main/resources/spring/service/context-validator.xml b/src/main/resources/spring/context-validator.xml similarity index 100% rename from src/main/resources/spring/service/context-validator.xml rename to src/main/resources/spring/context-validator.xml diff --git a/src/main/resources/spring/service/cache/dev/context-ehcache3.xml b/src/main/resources/spring/dev/context-ehcache3.xml similarity index 100% rename from src/main/resources/spring/service/cache/dev/context-ehcache3.xml rename to src/main/resources/spring/dev/context-ehcache3.xml diff --git a/src/main/resources/spring/service/cache/dev/ehcache.xml b/src/main/resources/spring/dev/ehcache.xml similarity index 100% rename from src/main/resources/spring/service/cache/dev/ehcache.xml rename to src/main/resources/spring/dev/ehcache.xml diff --git a/src/main/resources/spring/service/cache/dev/ehcache3.xml b/src/main/resources/spring/dev/ehcache3.xml similarity index 100% rename from src/main/resources/spring/service/cache/dev/ehcache3.xml rename to src/main/resources/spring/dev/ehcache3.xml diff --git a/src/main/resources/spring/service/cache/local/context-ehcache3.xml b/src/main/resources/spring/local/context-ehcache3.xml similarity index 100% rename from src/main/resources/spring/service/cache/local/context-ehcache3.xml rename to src/main/resources/spring/local/context-ehcache3.xml diff --git a/src/main/resources/spring/service/cache/local/ehcache.xml b/src/main/resources/spring/local/ehcache.xml similarity index 100% rename from src/main/resources/spring/service/cache/local/ehcache.xml rename to src/main/resources/spring/local/ehcache.xml diff --git a/src/main/resources/spring/service/cache/local/ehcache3.xml b/src/main/resources/spring/local/ehcache3.xml similarity index 100% rename from src/main/resources/spring/service/cache/local/ehcache3.xml rename to src/main/resources/spring/local/ehcache3.xml diff --git a/src/main/resources/spring/mvc/mvc-converter.xml b/src/main/resources/spring/mvc-converter.xml similarity index 72% rename from src/main/resources/spring/mvc/mvc-converter.xml rename to src/main/resources/spring/mvc-converter.xml index 3ce0377b..423282c0 100644 --- a/src/main/resources/spring/mvc/mvc-converter.xml +++ b/src/main/resources/spring/mvc-converter.xml @@ -6,20 +6,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - - - - - - - - - - - - - - - - - - - - - - - - -