somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib

Browse Source
This commit is contained in:
com02 2021-12-17 17:39:02 +09:00
commit a3b60c07cb
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/nlib/nlib.properties
View File

@ -99,10 +99,10 @@ list.paging.page.size = 10
main.banner.img.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/images/bg/bg-mainbanner.jpg main.banner.img.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/images/bg/bg-mainbanner.jpg
#---------------------------------------- #----------------------------------------
# \ucca8\ubd80\ud30c\uc77c \uacbd\ub85c \uc815\ubcf4 # Q&A \ucca8\ubd80\ud30c\uc77c \uc5c5\ub85c\ub4dc \uad00\ub828
#---------------------------------------- #----------------------------------------
# \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 # \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58
# \ub85c\uceec LLLLLLLLLLLLLLL # \ub85c\uceecPC
#fileupload.base.path = C:/iams/workspace/nlib/data/fileupload #fileupload.base.path = C:/iams/workspace/nlib/data/fileupload
# \uac1c\ubc1c\uc11c\ubc84 # \uac1c\ubc1c\uc11c\ubc84
fileupload.base.path = /nfs_nas_dev/uac/nlib/qna fileupload.base.path = /nfs_nas_dev/uac/nlib/qna
@ -110,7 +110,7 @@ fileupload.base.path = /nfs_nas_dev/uac/nlib/qna
fileupload.max.mbsize = 10 fileupload.max.mbsize = 10
# \ucd5c\ub300 \ud30c\uc77c \uac1c\uc218 # \ucd5c\ub300 \ud30c\uc77c \uac1c\uc218
fileupload.max.files = 5 fileupload.max.files = 5
# \ud30c\uc77c \uc5c5\ub85c\ub4dc \uac00\ub2a5 \ud655\uc7a5\uc790 (\uc911\uac04\uc5d0 \uacf5\ubc31\uc774 \uc5c6\uc5b4\uc57c\ud568) # \ud30c\uc77c \uc5c5\ub85c\ub4dc \uac00\ub2a5 \ud655\uc7a5\uc790
fileupload.acceptable.ext = image/*,.hwp,.xls,.xlsx,.ppt,.pptx,.doc,.docx,.txt fileupload.acceptable.ext = image/*,.hwp,.xls,.xlsx,.ppt,.pptx,.doc,.docx,.txt

2
src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp
View File

@ -42,7 +42,7 @@
</c:if> </c:if>
<!-- File Upload : 시작--> <!-- File Upload : 시작-->
<script src="<c:out value='${pageContext.request.contextPath}' />/js/fileupload/dropzone.js"></script> <script src="<c:out value='${pageContext.request.contextPath}' />/js/fileupload/dropzone-nlib.js"></script>
<!-- File Upload : 종료 --> <!-- File Upload : 종료 -->
<!-- SmartEditor : 시작 --> <!-- SmartEditor : 시작 -->

2
src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp
View File

@ -121,7 +121,7 @@ function fn_downloadFile(attachFileId, fileSn) {
<div class="view-body"> <div class="view-body">
<div class="view-con"> <div class="view-con">
<div class="view-txt"> <div class="view-txt">
<c:out value='${article.content}' /> <c:out value='${article.content}' escapeXml='false' />
</div> </div>
</div> </div>
<ul class="attachments"> <ul class="attachments">

2
src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp
View File

@ -156,7 +156,7 @@ function fn_downloadFile(attachFileId, fileSn) {
<span class="right"><c:out value='${article.modDd }'/></span> <span class="right"><c:out value='${article.modDd }'/></span>
</div> </div>
<div class="answer-con"> <div class="answer-con">
<p><c:out value='${article.answer}'/></p> <p><c:out value='${article.answer}' escapeXml = 'false' /></p>
</div> </div>
</div> </div>
</c:if> </c:if>

0
src/main/webapp/js/fileupload/dropzone.js → src/main/webapp/js/fileupload/dropzone-nlib.js
View File