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/doc/XOT-D-001-메뉴구조도 웹서비스-Ver1.0.xlsx b/doc/XOT-D-001-메뉴구조도 웹서비스-Ver1.0.xlsx
new file mode 100644
index 00000000..54c741cc
Binary files /dev/null and b/doc/XOT-D-001-메뉴구조도 웹서비스-Ver1.0.xlsx differ
diff --git a/doc/통합플랫폼_업무흐름도_V0.2.pptx b/doc/통합플랫폼_업무흐름도_V0.2.pptx
new file mode 100644
index 00000000..8d2666ca
Binary files /dev/null and b/doc/통합플랫폼_업무흐름도_V0.2.pptx differ
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/java/kr/xit/framework/core/config/CacheConfig3.java b/src/main/java/kr/xit/framework/core/config/ignore/CacheConfig3.java
similarity index 93%
rename from src/main/java/kr/xit/framework/core/config/CacheConfig3.java
rename to src/main/java/kr/xit/framework/core/config/ignore/CacheConfig3.java
index d41180e0..b2111789 100644
--- a/src/main/java/kr/xit/framework/core/config/CacheConfig3.java
+++ b/src/main/java/kr/xit/framework/core/config/ignore/CacheConfig3.java
@@ -1,5 +1,4 @@
-/*
-package kr.xit.framework.core.config;
+package kr.xit.framework.core.config.ignore;
import java.net.URISyntaxException;
import java.net.URL;
@@ -11,8 +10,8 @@ import org.springframework.cache.jcache.JCacheManagerFactoryBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-//@Configuration
-//@EnableCaching
+@Configuration
+@EnableCaching
public class CacheConfig3 {
@Bean
@@ -31,4 +30,3 @@ public class CacheConfig3 {
return cmfb;
}
}
-*/
diff --git a/src/main/java/kr/xit/framework/core/config/ignore/JasyptConfig.java b/src/main/java/kr/xit/framework/core/config/ignore/JasyptConfig.java
new file mode 100644
index 00000000..9b97998e
--- /dev/null
+++ b/src/main/java/kr/xit/framework/core/config/ignore/JasyptConfig.java
@@ -0,0 +1,44 @@
+package kr.xit.framework.core.config.ignore;
+
+import org.jasypt.encryption.StringEncryptor;
+import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
+import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
+import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class JasyptConfig {
+
+ @Bean(name = "jasyptStringEncryptor")
+ public StringEncryptor stringEncryptor() {
+ final String key = "xit5811807!@";
+ PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
+ SimpleStringPBEConfig config = new SimpleStringPBEConfig();
+ config.setPassword(key);
+ config.setAlgorithm("PBEWithMD5AndDES");
+ config.setPoolSize("1");
+ encryptor.setConfig(config);
+ return encryptor;
+ }
+
+ //FIXME : 설정의 암호화 필요시
+ public static void main(String[] args) {
+ StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
+ encryptor.setAlgorithm("PBEWithMD5AndDES");
+ encryptor.setPassword("xit5811807!@");
+ String url = encryptor.encrypt("jdbc:log4jdbc:mariadb://211.119.124.122:3306/xplatform?useUnicode=true&characterEncoding=utf8serverTimezone=Asia/Seoul&useSSL=false");
+ String id = encryptor.encrypt("root");
+ String passwd = encryptor.encrypt("xit5811807");
+ String decryptedPass = encryptor.decrypt(url);
+ System.out.println(url);
+ System.out.println(id);
+ System.out.println(passwd);
+ System.out.println(decryptedPass);
+
+ }
+
+}
+
+
+
diff --git a/src/main/resources/props/dev/globals.properties b/src/main/resources/props/dev/globals.properties
index 7ae725ce..f0a3b3bb 100644
--- a/src/main/resources/props/dev/globals.properties
+++ b/src/main/resources/props/dev/globals.properties
@@ -21,19 +21,15 @@ Globals.OsType = WINDOWS
Globals.LocalIp = 127.0.0.1
# DB\uC11C\uBC84 \uD0C0\uC785(mysql,oracle,altibase,tibero) - datasource \uBC0F sqlMap \uD30C\uC77C \uC9C0\uC815\uC5D0 \uC0AC\uC6A9\uB428
-Globals.DbType = mysql
-Globals.UserName=root
-Globals.Password=xit5811807
-#Globals.UserName=new_inbus
-#Globals.Password=bustms!2018
-
-# maria
# \uAC1C\uBC1C
Globals.DriverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-Globals.Url=jdbc:log4jdbc:mariadb://211.119.124.122:3306/xplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&useSSL=false
-#Globals.DriverClassName=org.mariadb.jdbc.Driver
-#Globals.Url=jdbc:mariadb://211.119.124.122:3306/xplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&useSSL=false
-
+#Globals.Url=jdbc:log4jdbc:mariadb://211.119.124.122:3306/xplatform?useUnicode=true&characterEncoding=utf8serverTimezone=Asia/Seoul&useSSL=falsejdbc:log4jdbc:mariadb://211.119.124.122:3306/xplatform?useUnicode=true&characterEncoding=utf8serverTimezone=Asia/Seoul&useSSL=false
+#Globals.UserName=root
+#Globals.Password=xit5811807
+Globals.DbType = mysql
+Globals.Url=ENC(zkjZYDiQT1ELZvJgKnMmAGq1f6MScCS5J0KxMn58zNI1nwQ+rCSUIZAVZMEvQZ9Gj/ISlqZojzoZp+5/eHQMStpRlXNXxsL8OVls+vVKjqvbABZ3zr9Ko3g9/Bkx+BC3y5Di/ycV3+GqR+ml8Fy5SMyAIXy8O/TFr19gFaqEyJgAmKNGFkGg7OpWUsfs7XXc)
+Globals.UserName=ENC(jzgcdK8FU5x06QfuAD0+FA==)
+Globals.Password=ENC(S+FRTHOPAw/XPGBz4j/f9ZN4RZzbnbsz)
#Globals.DriverClassName=com.mysql.jdbc.Driver
#Globals.Url=jdbc:mysql://211.119.124.122:3306/xplatform
diff --git a/src/main/resources/props/local/globals.properties b/src/main/resources/props/local/globals.properties
index 67f1e1c6..8ba16e64 100644
--- a/src/main/resources/props/local/globals.properties
+++ b/src/main/resources/props/local/globals.properties
@@ -21,16 +21,19 @@ Globals.OsType = WINDOWS
Globals.LocalIp = 127.0.0.1
# DB\uC11C\uBC84 \uD0C0\uC785(mysql,oracle,altibase,tibero) - datasource \uBC0F sqlMap \uD30C\uC77C \uC9C0\uC815\uC5D0 \uC0AC\uC6A9\uB428
-Globals.DbType = mysql
-Globals.UserName=root
-Globals.Password=xit5811807
#Globals.UserName=new_inbus
#Globals.Password=bustms!2018
# maria
# \uAC1C\uBC1C
Globals.DriverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-Globals.Url=jdbc:log4jdbc:mariadb://211.119.124.122:3306/xplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&useSSL=false
+#Globals.Url=jdbc:log4jdbc:mariadb://211.119.124.122:3306/xplatform?useUnicode=true&characterEncoding=utf8serverTimezone=Asia/Seoul&useSSL=falsejdbc:log4jdbc:mariadb://211.119.124.122:3306/xplatform?useUnicode=true&characterEncoding=utf8serverTimezone=Asia/Seoul&useSSL=false
+#Globals.UserName=root
+#Globals.Password=xit5811807
+Globals.DbType = mysql
+Globals.Url=ENC(zkjZYDiQT1ELZvJgKnMmAGq1f6MScCS5J0KxMn58zNI1nwQ+rCSUIZAVZMEvQZ9Gj/ISlqZojzoZp+5/eHQMStpRlXNXxsL8OVls+vVKjqvbABZ3zr9Ko3g9/Bkx+BC3y5Di/ycV3+GqR+ml8Fy5SMyAIXy8O/TFr19gFaqEyJgAmKNGFkGg7OpWUsfs7XXc)
+Globals.UserName=ENC(jzgcdK8FU5x06QfuAD0+FA==)
+Globals.Password=ENC(S+FRTHOPAw/XPGBz4j/f9ZN4RZzbnbsz)
#Globals.DriverClassName=org.mariadb.jdbc.Driver
#Globals.Url=jdbc:mariadb://211.119.124.122:3306/xplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true&useSSL=false
@@ -127,8 +130,8 @@ exception.log.trace=true
file.upload.allow.max-size: 2048
file.upload.allow.ext=
-#file.upload.root=/Users/minuk/data/fims/upload
-file.upload.root=D:/data/fims/upload
+file.upload.root=/Users/minuk/data/fims/upload
+#file.upload.root=D:/data/fims/upload
file.upload.temp.path=/temp
file.upload.natl-newspaper.path=/natl-newspaper
file.upload.busonly-cctv.path=/busonly
@@ -136,11 +139,11 @@ file.upload.cctv-fix.path=/cctv-fix
file.upload.cctv-drv.path=/cctv-drv
file.upload.cmm-board.path=/cmm-board
-#file.rcv.root=/Users/minuk/data/fims/extnl/rcv
-#file.rcv.backup.root=/Users/minuk/data/fims/extnl/backup
-#file.res.root=/Users/minuk/data/fims/extnl/res
-file.rcv.root=D:/data/fims/extnl/rcv
-file.rcv.backup.root=D:/data/fims/extnl/backup
-file.res.root=D:/data/fims/extnl/res
+file.rcv.root=/Users/minuk/data/fims/extnl/rcv
+file.rcv.backup.root=/Users/minuk/data/fims/extnl/backup
+file.res.root=/Users/minuk/data/fims/extnl/res
+#file.rcv.root=D:/data/fims/extnl/rcv
+#file.rcv.backup.root=D:/data/fims/extnl/backup
+#file.res.root=D:/data/fims/extnl/res
file.rcv.natl-newspaper.path=/natl-newspaper
file.rcv.busonly-cctv.path=/busonly
diff --git a/src/main/resources/spring/service/context-properties.xml b/src/main/resources/spring/service/context-properties.xml
index e0386ff4..c1f7a2ae 100644
--- a/src/main/resources/spring/service/context-properties.xml
+++ b/src/main/resources/spring/service/context-properties.xml
@@ -7,6 +7,29 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ classpath:/props/${env}/globals.properties
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml
index 8f46a801..2ee3aff0 100644
--- a/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml
+++ b/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml
@@ -101,7 +101,7 @@
AND trr.reglt_de BETWEEN #{sch_date_from} AND #{sch_date_to}
- AND trr.regist_dt BETWEEN #{sch_date_from} AND #{sch_date_to}
+ AND SUBSTR(trr.regist_dt,1,8) BETWEEN REPLACE(#{sch_date_from},'-','') AND REPLACE(#{sch_date_to},'-','')
AND INSTR(trr.vhcle_no, #{vhcleNo}) > 0
@@ -116,7 +116,7 @@
AND trr.regist_se_code = #{registSeCode}
- ORDER BY trr.sys_code, trr.reglt_se_code, trr.reglt_de, trr.vhcle_no, trr.reglt_begin_time
+ ORDER BY trr.sys_code, trr.reglt_se_code, teerc.extrl_reglt_cntc_id, tecsd.interface_seq_n, tecsd.ctzn_sttemnt_detail_sn, trr.reglt_de, trr.vhcle_no, trr.reglt_begin_time
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 98b75a52..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
@@ -462,12 +462,21 @@
WHERE reglt_id = #{regltId})
- -- 시민신고(국민신문고)
+ -- 시민신고(국민신문고) : 초기자료 편집인 경우 시민신고 이미지 전체, 그외는 해당 차량 단속이미지만 선택
+ AND tcfm.file_job_id LIKE (SELECT CONCAT(interface_seq_n, IF(#{regltProcessSttusCode} = '01', '%', ctzn_sttemnt_detail_sn))
+ FROM tb_ec_ctzn_sttemnt_detail
+ WHERE reglt_id = #{regltId})
+
+ ORDER BY tcfm.file_job_id, tcfd.orginl_file_nm
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp
index 6119375c..09a0ed1c 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp
@@ -1,4 +1,4 @@
-<%--
+<%@ page import="kr.xit.fims.biz.FimsConst" %><%--
================================================================================
File : /fims/biz/cmm/cmmCrackdownMgtPopup.jsp
Name : 단속 데이타 처리 - 단속관리>단속현황관리
@@ -12,6 +12,7 @@ Date Author Description
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp"%>
+