diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index 28aa42e3..428b7d88 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -69,8 +69,11 @@ public class BaseController { } @GetMapping("/dashboard") - public ModelAndView dashboard(@AuthenticationPrincipal UserInfo loginUser) { + public ModelAndView dashboard(@AuthenticationPrincipal UserInfo loginUser, HttpSession session) { ModelAndView mav = new ModelAndView("login/dashboard"); + + setSession(loginUser, session); + PublicBoard noticeParams = new PublicBoard(); noticeParams.setPublicType("PLB001"); noticeParams.setRowCnt(7); diff --git a/src/main/resources/application-test1.properties b/src/main/resources/application-test1.properties index 78da982f..f489a466 100644 --- a/src/main/resources/application-test1.properties +++ b/src/main/resources/application-test1.properties @@ -5,11 +5,11 @@ tomcat.ajp.protocol=HTTP/1.1 logging.level.org.apache.tomcat: DEBUG logging.level.org.apache.catalina: DEBUG tomcat.cluster.enabled=true -tomcat.cluster.static-member-host=118.219.150.34 -tomcat.cluster.static-member-port=50542 -tomcat.cluster.static-member-unique-id={0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1} -tomcat.cluster.receiver-address=118.219.150.34 -tomcat.cluster.receiver-port=50540 +tomcat.cluster.static-member-host=172.80.0.4 +tomcat.cluster.static-member-port=4042 +tomcat.cluster.static-member-unique-id={0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2} +tomcat.cluster.receiver-address=172.80.0.3 +tomcat.cluster.receiver-port=4040 tomcat.cluster.receiver-max-threads=4 #file upload diff --git a/src/main/resources/application-test2.properties b/src/main/resources/application-test2.properties index 6da8f9d2..1c61924f 100644 --- a/src/main/resources/application-test2.properties +++ b/src/main/resources/application-test2.properties @@ -5,11 +5,11 @@ tomcat.ajp.protocol=HTTP/1.1 logging.level.org.apache.tomcat: DEBUG logging.level.org.apache.catalina: DEBUG tomcat.cluster.enabled=true -tomcat.cluster.static-member-host=118.219.150.34 -tomcat.cluster.static-member-port=50540 +tomcat.cluster.static-member-host=172.80.0.3 +tomcat.cluster.static-member-port=4040 tomcat.cluster.static-member-unique-id={0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1} -tomcat.cluster.receiver-address=118.219.150.34 -tomcat.cluster.receiver-port=50542 +tomcat.cluster.receiver-address=172.80.0.4 +tomcat.cluster.receiver-port=4042 tomcat.cluster.receiver-max-threads=4 #file upload diff --git a/src/main/resources/static/js/authMgt/authMgt.js b/src/main/resources/static/js/authMgt/authMgt.js index c90c350a..ac7e2b5e 100644 --- a/src/main/resources/static/js/authMgt/authMgt.js +++ b/src/main/resources/static/js/authMgt/authMgt.js @@ -51,7 +51,7 @@ $(document).on('click', '.selectTh', function (){ $(document).on('click', '.radioTd', function (event){ const chkbox = $(this).find('input'); - if(event.target.type !== "checkbox"){ + if(event.target.type !== "checkbox" && event.target.type !== "radio"){ chkbox.prop('checked', !chkbox[0].checked); } apprvChkboxControl(chkbox[0]);