Merge branch 'devs/bap-monitoring' into 'jenkins_with_weblogic'
내부 연계 시스템 관리 등록 및 수정 시 송수신 디렉토리 데이터 escape 문자열 처리 See merge request eapim/eapim-admin!16
This commit is contained in:
@@ -46,8 +46,7 @@
|
|||||||
var name = $(this).attr('name');
|
var name = $(this).attr('name');
|
||||||
//.toUpperCase();
|
//.toUpperCase();
|
||||||
if ( name != null ) {
|
if ( name != null ) {
|
||||||
var raw = json[name.toUpperCase()];
|
$(this).val(json[name.toUpperCase()]);
|
||||||
$(this).val(decodeHtml(raw));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -58,11 +57,6 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function decodeHtml(html) {
|
|
||||||
var txt = document.createElement("textarea");
|
|
||||||
txt.innerHTML = html;
|
|
||||||
return txt.value;
|
|
||||||
}
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
var key = "${param.sysCd}";
|
var key = "${param.sysCd}";
|
||||||
var returnUrl = '${param.returnUrl}';
|
var returnUrl = '${param.returnUrl}';
|
||||||
|
|||||||
+13
-1
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Controller;
|
|||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
import org.springframework.web.util.HtmlUtils;
|
||||||
|
|
||||||
import com.eactive.eai.agent.command.CommonCommand;
|
import com.eactive.eai.agent.command.CommonCommand;
|
||||||
import com.eactive.eai.rms.common.base.BapBaseAnnotationController;
|
import com.eactive.eai.rms.common.base.BapBaseAnnotationController;
|
||||||
@@ -77,7 +78,13 @@ public class BapSysinfoController extends BapBaseAnnotationController {
|
|||||||
|
|
||||||
String userid = SessionManager.getUserId(request);
|
String userid = SessionManager.getUserId(request);
|
||||||
paramMap.put("userid", userid );
|
paramMap.put("userid", userid );
|
||||||
|
|
||||||
|
String sendDir = HtmlUtils.htmlUnescape((String)paramMap.get("sendDir"));
|
||||||
|
String recvDir = HtmlUtils.htmlUnescape((String)paramMap.get("recvDir"));
|
||||||
|
paramMap.put("sendDir", sendDir);
|
||||||
|
paramMap.put("recvDir", recvDir);
|
||||||
|
|
||||||
|
|
||||||
service.insert(paramMap);
|
service.insert(paramMap);
|
||||||
CommonCommand command = new CommonCommand("com.eactive.eai.agent.sysinfo.UpdateSysinfoCommand",(String)paramMap.get("sysCd"));
|
CommonCommand command = new CommonCommand("com.eactive.eai.agent.sysinfo.UpdateSysinfoCommand",(String)paramMap.get("sysCd"));
|
||||||
agentUtilService.broadcast(command);
|
agentUtilService.broadcast(command);
|
||||||
@@ -90,6 +97,11 @@ public class BapSysinfoController extends BapBaseAnnotationController {
|
|||||||
|
|
||||||
String userid = SessionManager.getUserId(request);
|
String userid = SessionManager.getUserId(request);
|
||||||
paramMap.put("userid", userid );
|
paramMap.put("userid", userid );
|
||||||
|
|
||||||
|
String sendDir = HtmlUtils.htmlUnescape((String)paramMap.get("sendDir"));
|
||||||
|
String recvDir = HtmlUtils.htmlUnescape((String)paramMap.get("recvDir"));
|
||||||
|
paramMap.put("sendDir", sendDir);
|
||||||
|
paramMap.put("recvDir", recvDir);
|
||||||
|
|
||||||
service.update(paramMap);
|
service.update(paramMap);
|
||||||
CommonCommand command = new CommonCommand("com.eactive.eai.agent.sysinfo.UpdateSysinfoCommand",(String)paramMap.get("sysCd"));
|
CommonCommand command = new CommonCommand("com.eactive.eai.agent.sysinfo.UpdateSysinfoCommand",(String)paramMap.get("sysCd"));
|
||||||
|
|||||||
Reference in New Issue
Block a user