tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO'

Browse Source 
Conflicts:
	src/main/resources/egovframework/egovProps/globals_local.properties
This commit is contained in:
JIWOO 2024-10-25 12:32:46 +09:00
commit f9c8308e53
6 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/egovframework/egovProps/globals_dev.properties
View File

@ -224,4 +224,8 @@ oz.ozServerNm=http://119.193.215.98:8086
gw.url=https://ovis.opco.co.kr gw.url=https://ovis.opco.co.kr
#\ubcf8\uc778\uc778\uc99d \uc11c\ubc84\uc8fc\uc18c #\ubcf8\uc778\uc778\uc99d \uc11c\ubc84\uc8fc\uc18c
cert.sServerName=23http://fairnet.kofair.or.kr cert.sServerName=23http://fairnet.kofair.or.kr
#\ub300\uc6a9\ub7c9 innorix license
Globals.Innorix.License=dev
#Globals.Innorix.FilePath=/usr/local/tomcat/file/sht/

6
src/main/resources/egovframework/egovProps/globals_svr.properties
View File

@ -405,4 +405,8 @@ oz.ozServerNm=http://119.193.215.98:8086
gw.url=https://gwd.unicologx.com gw.url=https://gwd.unicologx.com
#\ubcf8\uc778\uc778\uc99d \uc11c\ubc84\uc8fc\uc18c #\ubcf8\uc778\uc778\uc99d \uc11c\ubc84\uc8fc\uc18c
cert.sServerName=23http://fairnet.kofair.or.kr cert.sServerName=23http://fairnet.kofair.or.kr
#\ub300\uc6a9\ub7c9 innorix license
Globals.Innorix.License=svr
#Globals.Innorix.FilePath=/usr/local/tomcat/file/sht/

1
src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml
View File

@ -100,5 +100,6 @@
<mvc:resources mapping="/codemirror/**" location="/codemirror/" /> <mvc:resources mapping="/codemirror/**" location="/codemirror/" />
<mvc:resources mapping="/AnySign4PC/**" location="/AnySign4PC/" /> <mvc:resources mapping="/AnySign4PC/**" location="/AnySign4PC/" />
<mvc:resources mapping="/html/**" location="/html/" /> <mvc:resources mapping="/html/**" location="/html/" />
<mvc:resources mapping="/innorix/**" location="/innorix/" />
</beans> </beans>

13
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/board/write.jsp
View File

@ -1,6 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%> <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<!doctype html> <!doctype html>
<html lang="ko"> <html lang="ko">
<head> <head>
@ -8,7 +9,13 @@
<link href='/css/space.css' rel='stylesheet' type='text/css'/> <link href='/css/space.css' rel='stylesheet' type='text/css'/>
<link href='/css/seed.contents.css' rel='stylesheet' type='text/css'/> <link href='/css/seed.contents.css' rel='stylesheet' type='text/css'/>
<link href='/css/seed.mediaquery.css' rel='styleGsheet' type='text/css'/> <link href='/css/seed.mediaquery.css' rel='styleGsheet' type='text/css'/>
<link href='/site/ntcc/css/gtmCustom.css' rel='stylesheet' type='text/css'/> <!-- <link href='/site/ntcc/css/gtmCustom.css' rel='stylesheet' type='text/css'/> -->
<!-- 대용량 파일 업로드 솔루션 -->
<spring:eval expression="@property['Globals.Innorix.License']" var="license"/>
<script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script>
<script src="<c:url value='/innorix/innorix_${license}.js' />"></script>
<link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css">
<script src="/editor/webnote.js"></script> <script src="/editor/webnote.js"></script>
</head> </head>
@ -152,7 +159,7 @@
$("#paramFrm").submit(); $("#paramFrm").submit();
} }
</script> </script>
<script src="/js/seed/jquery.form.js"></script> <script src="/js/jquery.form.js"></script>
<script src="/js/seed/seedFileUtil.js"></script> <script src="/js/seedFileUtil.js"></script>
</body> </body>
</html> </html>

2
src/main/webapp/innorix/exam/upload.html
View File

@ -4,7 +4,7 @@
<!-- <link rel="stylesheet" href="../innorix.css"> --> <!-- <link rel="stylesheet" href="../innorix.css"> -->
<link rel="stylesheet" href="/innorix/innorix.css"> <link rel="stylesheet" href="/innorix/innorix.css">
<!-- <script src="../innorix.js"></script> --> <!-- <script src="../innorix.js"></script> -->
<script src="/innorix/innorix.js"></script> <script src="/innorix/innorix_dev.js"></script>
<script> <script>
var control = new Object(); var control = new Object();
window.onload = function() { window.onload = function() {

4
src/main/webapp/innorix/innorix_dev.js
View File

@ -19,7 +19,9 @@
// 개발 라이센스 적용 (만료 23.12.31) // 개발 라이센스 적용 (만료 23.12.31)
// var INNORIX_LICENSE = "DMhUDOx/+RoGojh0ECXphlfh5DGpLolyCxk7xMuNCAeJ0nqF8SQtKjJdL0jvHs4dgrMIaHrcSeNY+U28a3WFA5No4Pc="; // var INNORIX_LICENSE = "DMhUDOx/+RoGojh0ECXphlfh5DGpLolyCxk7xMuNCAeJ0nqF8SQtKjJdL0jvHs4dgrMIaHrcSeNY+U28a3WFA5No4Pc=";
// 개발 라이센스 적용 (만료 23.12.31) // 개발 라이센스 적용 (만료 23.12.31)
var INNORIX_LICENSE = "rgwvVyJLYKA+HcKL3U8+lES4u1UTQ6mntczgffZjRUtadBNBmmv8qmYcu6qOwOnh/edArIq5/531+vt8lbIPhrpwGVo="; // var INNORIX_LICENSE = "rgwvVyJLYKA+HcKL3U8+lES4u1UTQ6mntczgffZjRUtadBNBmmv8qmYcu6qOwOnh/edArIq5/531+vt8lbIPhrpwGVo=";
// 개발 라이센스 적용 (만료 2024-12-31)
var INNORIX_LICENSE = "xry3vol8PslToOnuOLH5Xcq33pNl46DLigzucHL1EtXHoNYw33lpkLSuyYuYF9pnle2MZ+XSQB6CNP56k/hyrWd82fo=";
var INNORIX_VERSION = '1.1.3.458'; var INNORIX_VERSION = '1.1.3.458';