Index: base3.10/src/main/resources/egovframework/spring/com/scheduling/context-scheduling-sym-log-lgm.xml =================================================================== --- base3.10/src/main/resources/egovframework/spring/com/scheduling/context-scheduling-sym-log-lgm.xml (revision 28) +++ base3.10/src/main/resources/egovframework/spring/com/scheduling/context-scheduling-sym-log-lgm.xml (revision 29) @@ -19,12 +19,12 @@ </bean> <!-- 시스템 로그 요약 스케줄러 --> - <bean id="sysLogScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> + <!-- <bean id="sysLogScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> <property name="triggers"> <list> <ref bean="sysLogTrigger" /> </list> </property> - </bean> + </bean> --> </beans> Index: base3.10/src/main/resources/egovframework/spring/com/context-syslogaop.xml =================================================================== --- base3.10/src/main/resources/egovframework/spring/com/context-syslogaop.xml (revision 28) +++ base3.10/src/main/resources/egovframework/spring/com/context-syslogaop.xml (revision 29) @@ -5,19 +5,19 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd"> <!-- System Log Aspect --> - <bean id="syslog" class="egovframework.com.sym.log.lgm.service.EgovSysLogAspect" /> + <!-- <bean id="syslog" class="egovframework.com.sym.log.lgm.service.EgovSysLogAspect" /> <aop:config> <aop:aspect id="sysLogAspect" ref="syslog"> - <!-- insert로 시작되는 service Method --> + insert로 시작되는 service Method <aop:around pointcut="execution(public * egovframework.com..impl.*Impl.insert*(..))" method="logInsert" /> - <!-- update로 시작되는 service Method --> + update로 시작되는 service Method <aop:around pointcut="execution(public * egovframework.com..impl.*Impl.update*(..))" method="logUpdate" /> - <!-- delete로 시작되는 service Method --> + delete로 시작되는 service Method <aop:around pointcut="execution(public * egovframework.com..impl.*Impl.delete*(..))" method="logDelete" /> - <!-- select로 시작되는 service Method --> + select로 시작되는 service Method <aop:around pointcut="execution(public * egovframework.com..impl.*Impl.select*(..))" method="logSelect" /> </aop:aspect> - </aop:config> + </aop:config> --> </beans> \ No newline at end of file Index: base3.10/src/main/webapp/css/admin/admin.css =================================================================== --- base3.10/src/main/webapp/css/admin/admin.css (revision 28) +++ base3.10/src/main/webapp/css/admin/admin.css (revision 29) @@ -880,7 +880,7 @@ .modal_content .dataTables_filter label { font-size:13px; color:#333; display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; align-items: center; } .modal_content .dataTables_filter label input { float:right; } -.fr-box.fr-basic .fr-element { max-height:450px; } +/* .fr-box.fr-basic .fr-element { max-height:450px; } */ .sms_wrap { display:block; margin-bottom:5px; } .sms_wrap button { width:35px; height:35px; } Index: base3.10/src/main/webapp/WEB-INF/tiles/template/adminHeader.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/template/adminHeader.jsp (revision 28) +++ base3.10/src/main/webapp/WEB-INF/tiles/template/adminHeader.jsp (revision 29) @@ -42,22 +42,6 @@ <%-- <link rel="icon" href="<c:url value='/imageview.do?fileId=${systemVO.coFavicon }' />" type="image/x-icon"> --%> <link rel="shortcut icon" href="<c:url value='/images/admin/favicon.ico' />" type="image/x-icon"> <link rel="icon" href="<c:url value='/images/admin/favicon.ico' />" type="image/x-icon"> - -<!-- 에디터 관련 추가 CSS, Javascript 추가 --> -<!-- Include external CSS. --> -<%-- <link href="<c:url value='/resource/editor/codemirror/lib/codemirror.css'/>" rel="stylesheet" type="text/css" /> --%> -<!-- Include Editor style. --> -<%-- <link href="<c:url value='/resource/editor/css/froala_editor.pkgd.min.css' />" rel="stylesheet" type="text/css" /> --%> -<%-- <link href="<c:url value='/resource/editor/css/froala_style.min.css' />" rel="stylesheet" type="text/css" /> --%> -<!-- Include external JS libs. --> -<%-- <script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'/>"></script> --%> -<%-- <script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'/>"></script> --%> -<!-- Include Editor JS files. --> -<%-- <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor.pkgd.js' />"></script> --%> -<%-- <script type="text/javascript" src="<c:url value='/resource/editor/js/languages/ko.js' />"></script> --%> -<%-- <script type="text/javascript" src="<c:url value='/js/com/imageViewFileUpload.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> --%> -<%-- <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor_script_custom.js'/>"></script> --%> -<!-- 에디터 관련 추가 CSS, Javascript 종료 --> <script type="text/javascript"> $(document).ready(function() { if("${message}" != null && "${message}" != "") { Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageRegist.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageRegist.jsp (revision 28) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageRegist.jsp (revision 29) @@ -45,11 +45,11 @@ <link rel="stylesheet" type="text/css" href="<c:url value='/resource/font-awesome/css/font-awesome.css'><c:param name="dt" value="${nowDate}"/></c:url>"> <link rel="stylesheet" type="text/css" href="<c:url value='/resource/editor/codemirror/lib/codemirror.css'><c:param name="dt" value="${nowDate}"/></c:url>" /> <!-- Include Editor JS files. --> +<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> +<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor.pkgd.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/languages/ko.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor_script_custom.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> -<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> -<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <!-- 에디터 관련 추가 CSS, Javascript 종료 --> <validator:javascript formName="articleVO" staticJavascript="false" xhtml="true" cdata="false" /> <script type="text/javascript"> @@ -148,7 +148,7 @@ <th scope="col" class="must"><label for="nttCn">${title}</label></th> <td class="nopd"> <textarea id="nttCn" name="nttCn"> -<%-- <c:if test="${not empty boardMasterVO.bbsForm}">${boardMasterVO.bbsForm}</c:if> --%> + <c:if test="${not empty boardMasterVO.bbsForm}">${boardMasterVO.bbsForm}</c:if> </textarea> </td> </tr> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageReply.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageReply.jsp (revision 28) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageReply.jsp (revision 29) @@ -40,11 +40,11 @@ <link rel="stylesheet" type="text/css" href="<c:url value='/resource/font-awesome/css/font-awesome.css'><c:param name="dt" value="${nowDate}"/></c:url>"> <link rel="stylesheet" type="text/css" href="<c:url value='/resource/editor/codemirror/lib/codemirror.css'><c:param name="dt" value="${nowDate}"/></c:url>" /> <!-- Include Editor JS files. --> +<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> +<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor.pkgd.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/languages/ko.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor_script_custom.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> -<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> -<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <!-- 에디터 관련 추가 CSS, Javascript 종료 --> <validator:javascript formName="articleVO" staticJavascript="false" xhtml="true" cdata="false"/> <script type="text/javascript"> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovBBSMasterUpdt.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovBBSMasterUpdt.jsp (revision 28) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovBBSMasterUpdt.jsp (revision 29) @@ -34,11 +34,11 @@ <link rel="stylesheet" type="text/css" href="<c:url value='/resource/font-awesome/css/font-awesome.css'><c:param name="dt" value="${nowDate}"/></c:url>"> <link rel="stylesheet" type="text/css" href="<c:url value='/resource/editor/codemirror/lib/codemirror.css'><c:param name="dt" value="${nowDate}"/></c:url>" /> <!-- Include Editor JS files. --> +<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> +<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor.pkgd.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/languages/ko.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor_script_custom.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> -<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> -<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <!-- 에디터 관련 추가 CSS, Javascript 종료 --> <script type="text/javascript" src="<c:url value="/validator.do"/>"></script> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageUpdt.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageUpdt.jsp (revision 28) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageUpdt.jsp (revision 29) @@ -43,11 +43,11 @@ <link rel="stylesheet" type="text/css" href="<c:url value='/resource/font-awesome/css/font-awesome.css'><c:param name="dt" value="${nowDate}"/></c:url>"> <link rel="stylesheet" type="text/css" href="<c:url value='/resource/editor/codemirror/lib/codemirror.css'><c:param name="dt" value="${nowDate}"/></c:url>" /> <!-- Include Editor JS files. --> +<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> +<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor.pkgd.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/languages/ko.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor_script_custom.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> -<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> -<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <!-- 에디터 관련 추가 CSS, Javascript 종료 --> <validator:javascript formName="articleVO" staticJavascript="false" xhtml="true" cdata="false" /> <script type="text/javascript"> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovBBSMasterRegist.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovBBSMasterRegist.jsp (revision 28) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovBBSMasterRegist.jsp (revision 29) @@ -36,11 +36,11 @@ <link rel="stylesheet" type="text/css" href="<c:url value='/resource/font-awesome/css/font-awesome.css'><c:param name="dt" value="${nowDate}"/></c:url>"> <link rel="stylesheet" type="text/css" href="<c:url value='/resource/editor/codemirror/lib/codemirror.css'><c:param name="dt" value="${nowDate}"/></c:url>" /> <!-- Include Editor JS files. --> +<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> +<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor.pkgd.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/languages/ko.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <script type="text/javascript" src="<c:url value='/resource/editor/js/froala_editor_script_custom.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> -<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/codemirror.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> -<script type="text/javascript" src="<c:url value='/resource/editor/codemirror/lib/xml.js'><c:param name="dt" value="${nowDate}"/></c:url>"></script> <!-- 에디터 관련 추가 CSS, Javascript 종료 --> <script type="text/javascript" src="<c:url value="/validator.do"/>"></script>