From 6193b8dab55aa34676ec386cbf2d0defbb67b8a1 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 28 Jul 2023 14:11:55 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=EC=98=A8=20=EC=BB=A4=EB=B0=8B=20=20-=20globals=5Floca?= =?UTF-8?q?l.properties=20db=20=EC=A0=91=EC=86=8D=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=20-=20mainPage.jsp=20httpredirect=20?= =?UTF-8?q?=ED=95=A8=EC=88=98=20=EC=A1=B0=EA=B1=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframework/egovProps/globals_local.properties | 3 ++- .../egovframework/spring/com/context-datasource.xml | 6 +++++- src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp | 8 ++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 6e981d7a..52b711f1 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -28,7 +28,8 @@ Globals.Env = local # mysql Globals.DriverClassName=com.mysql.jdbc.Driver -Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon +#Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon +Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon Globals.UserName= mjonUr #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon_20230221 #Globals.UserName= mjonUr_20230221 diff --git a/src/main/resources/egovframework/spring/com/context-datasource.xml b/src/main/resources/egovframework/spring/com/context-datasource.xml index d471ef0f..775f8c91 100644 --- a/src/main/resources/egovframework/spring/com/context-datasource.xml +++ b/src/main/resources/egovframework/spring/com/context-datasource.xml @@ -1,6 +1,9 @@ + xmlns:util="http://www.springframework.org/schema/util" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util-4.0.xsd"> + diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 84151f72..cc50a957 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -1,6 +1,8 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> + @@ -15,8 +17,10 @@ var blineCode = "${blineCode}"; $(document).ready(function() { // http => https 로 이동 - httpsRedirect(); - + if(${Env eq 'prod'}){ + httpsRedirect(); + } + // 슬라이드 이미지 변경 //setMainSlideImgChange();