diff --git a/src/main/resources/sql/DML.sql b/db/sql/DML.sql similarity index 100% rename from src/main/resources/sql/DML.sql rename to db/sql/DML.sql diff --git a/src/main/resources/sql/index.sql b/db/sql/index.sql similarity index 100% rename from src/main/resources/sql/index.sql rename to db/sql/index.sql diff --git a/pom.xml b/pom.xml index 40e3d44b..883fef5a 100644 --- a/pom.xml +++ b/pom.xml @@ -667,6 +667,13 @@ --> + + + org.jasypt + jasypt-spring31 + 1.9.3 + + @@ -674,8 +681,47 @@ install ${basedir}/target fims - + + + src/main/resources + + *.properties + *-${env}.xml + **/${env}/* + message/**/* + spring/*.xml + spring/*/*.xml + spring/service/cache/*.xml + sqlmapper/**/* + validator/**/* + + true + + + + + maven-resources-plugin + + + copy-resources + + validate + + copy-resources + + + ${basedir}/target/dockerfile + + + src/main/docker + true + + + + + + org.apache.tomcat.maven tomcat7-maven-plugin @@ -914,5 +960,29 @@ + + + + + local + + local + + + true + + + + + + dev + + dev + + + false + + + diff --git a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml index f92bbe83..562f7161 100644 --- a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml @@ -467,7 +467,7 @@ FROM tb_ec_ctzn_sttemnt_detail WHERE reglt_id = #{regltId}) - ORDER BY tcfd.orginl_file_nm + ORDER BY tcfm.file_job_id, tcfd.orginl_file_nm