diff --git a/pom.xml b/pom.xml index cc30d9d4..7ed6dd00 100644 --- a/pom.xml +++ b/pom.xml @@ -69,12 +69,6 @@ - - - com.thetransactioncompany - cors-filter - 2.6 - egovframework.rte egovframework.rte.fdl.security diff --git a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java index be7acdb3..012fff09 100644 --- a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java +++ b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java @@ -46,7 +46,6 @@ import kcc.let.utl.sim.service.EgovClntInfo; */ @Controller -@CrossOrigin(origins = "*", methods = RequestMethod.POST) public class APILoginContoller { /** userManageService */ @@ -67,9 +66,9 @@ public class APILoginContoller { * @throws Exception */ @RequestMapping(value = "/web/chkloginKeyForOffedu.do") - public String loginKeyChkForOffedu(@RequestBody Map paramRequest, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception { - String userId = paramRequest.get("user_id"); - String key = paramRequest.get("key"); + public String loginKeyChkForOffedu(RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception { + String userId = request.getParameter("user_id"); + String key = request.getParameter("key"); //String returnUrl = paramRequest.get("returnUrl"); //e-배움터 문의결과 returnUrl 컨트롤은 불가능하다고 함 String returnUrl = ""; diff --git a/src/main/java/kcc/let/uat/uia/web/SimpleCORSFilter.java b/src/main/java/kcc/let/uat/uia/web/SimpleCORSFilter.java new file mode 100644 index 00000000..aa6ded24 --- /dev/null +++ b/src/main/java/kcc/let/uat/uia/web/SimpleCORSFilter.java @@ -0,0 +1,47 @@ +package kcc.let.uat.uia.web; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.stereotype.Component; + +/** + * e-배움터와 연동하여 로그인을 처리하는 컨트롤러 클래스 + * + * @author 이지우 + * @since 2023.08.31 + * @version 1.0 + * @see + */ + +@Component +public class SimpleCORSFilter implements Filter { + + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) + throws IOException, ServletException { + + HttpServletResponse response = (HttpServletResponse) res; + + response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With, remember-me"); + + response.setHeader("Access-Control-Allow-Origin", "*"); + //response.setHeader("Access-Control-Allow-Origin", "http://services.arcgisonline.com"); + chain.doFilter(req, res); + } + + public void init(FilterConfig filterConfig) { + } + + public void destroy() { + } + +} \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml index 31ab2905..1392960b 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml @@ -1168,10 +1168,5 @@ WHERE USER_ID = #userId# AND LCTR_DIV_CD = '30' AND APRVL_CD = '60' - AND PRCS_ORD = (SELECT - MAX(PRCS_APLCT_PRD_ORD) - FROM VE_PRCS_APLCT_PRD - WHERE LCTR_DIV_CD = '30' - AND USE_YN = 'Y') diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 84978b91..c709c576 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -60,6 +60,8 @@ $(document).ready(function (){ if("${instrDiv}" == 'tngrInstrDiv'){ $("#9991000").parent('li').hide(); $("#full_9991000").parent('li').hide(); + $("#99912000").parent('li').hide(); + $("#full_99912000").parent('li').hide(); }else if("${instrDiv}" == 'adultInstrDiv'){ $("#99923000").parent('li').hide(); $("#full_99923000").parent('li').hide(); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp index b9fdf932..367242fc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp @@ -264,18 +264,20 @@
+
-
-
- +
+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp index 7d2ea2a0..ebff8aa3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp @@ -49,6 +49,11 @@ }); } } + + function nextTab(tab){ + window.scrollTo(0,0); + $('.p_'+tab).children('a').click(); + }
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp index b66f5df3..f332ff97 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp @@ -119,10 +119,12 @@
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp index f295b7b9..33e05358 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp @@ -167,10 +167,9 @@
+
-
-
@@ -179,6 +178,9 @@
+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp index 4495e09e..0cde9626 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp @@ -594,17 +594,24 @@ - +
-
+
+ +
- - + + + +
- + + + +
- + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp index 0af39958..cc54683d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp @@ -700,6 +700,7 @@
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 42caa0a1..c4dac02e 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -19,73 +19,6 @@ *.do - - - CORS - com.thetransactioncompany.cors.CORSFilter - - cors.allowed.origins - * - - - cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT - - - cors.allowed.headers - Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers - - - cors.exposed.headers - Access-Control-Allow-Origin,Access-Control-Allow-Credentials - - - cors.support.credentials - false - - - cors.preflight.maxage - 10 - - - - CORS - /* - - - CorsFilter - org.apache.catalina.filters.CorsFilter - - cors.allowed.origins - * - - - cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT,DELETE - - - cors.allowed.headers - Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers - - - cors.exposed.headers - Access-Control-Allow-Origin,Access-Control-Allow-Credentials - - - - cors.support.credentials - false - - - cors.preflight.maxage - 10 - - - - CorsFilter - /* - - + + cors + kcc.let.uat.uia.web.SimpleCORSFilter + + + cors + /* + +