Commit @87b4508acec26e5ae07bf9d04e29834752f3be47

d3eb7c2

87b4508

.idea/FoxeduBaseCMS.iml

--- .idea/FoxeduBaseCMS.iml

+++ .idea/FoxeduBaseCMS.iml


 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/base/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/base/src/main/webapp" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+    <facet type="web" name="Web2">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/base/target/base-1.0/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/base/target/base-1.0" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />

d3eb7c2

87b4508

base/src/main/java/egovframework/com/cmm/service/Globals.java

--- base/src/main/java/egovframework/com/cmm/service/Globals.java

+++ base/src/main/java/egovframework/com/cmm/service/Globals.java


 	
 	public static final String VOD_PROBER = EgovProperties.getProperty("Globals.VodProber");
 
+	//CMS모드
+	public static final String CMS_MODE = EgovProperties.getProperty("CMS.mode");
+
 	// 웨일
 	public static final String CLIENT_ID = EgovProperties.getProperty("Globals.ClientId");
 	public static final String CLIENT_SECRET = EgovProperties.getProperty("Globals.ClientSecret");

d3eb7c2

87b4508

base/src/main/java/egovframework/com/front/msi/web/SearchServiceController.java

--- base/src/main/java/egovframework/com/front/msi/web/SearchServiceController.java

+++ base/src/main/java/egovframework/com/front/msi/web/SearchServiceController.java


 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import egovframework.com.cmm.service.JsonResponse;
+import egovframework.module.utl.fcc.service.CryptoUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;

 import egovframework.module.utl.fcc.service.EgovStringUtil;
 import egovframework.rte.fdl.property.EgovPropertyService;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 //검색 서비스 컨트롤러 클래스
 @Controller

     
         return "/front/sch/EgovCmySearch";
 	}
-	
+
+	//복호화
+	@RequestMapping("/sch/decrypt.do")
+	public @ResponseBody JsonResponse decrypt(HttpServletRequest request) throws Exception {
+		JsonResponse res = new JsonResponse();
+		res.setSuccess(true);
+
+		String encrypt = request.getParameter("encrypt");
+		String decrypt = CryptoUtil.decrypt(encrypt, null);
+		res.setCode(decrypt);
+
+		return res;
+	}
 }
 	

d3eb7c2

87b4508

base/src/main/java/egovframework/com/sec/ram/security/userdetails/util/EgovUserDetailsHelper.java

--- base/src/main/java/egovframework/com/sec/ram/security/userdetails/util/EgovUserDetailsHelper.java

+++ base/src/main/java/egovframework/com/sec/ram/security/userdetails/util/EgovUserDetailsHelper.java


 import javax.servlet.http.HttpServletResponse;
 
 import egovframework.module.sym.sit.service.SiteManageService;
+import egovframework.module.sym.sit.service.SiteManageVO;
 import egovframework.module.uat.uia.service.LoginService;
 import egovframework.module.uat.uia.service.LoginVO;
 import egovframework.com.cmm.service.EgovUserDetailsService;

d3eb7c2

87b4508

base/src/main/resources/egovframework/egovProps/globals.properties

--- base/src/main/resources/egovframework/egovProps/globals.properties

+++ base/src/main/resources/egovframework/egovProps/globals.properties


 #-----------------------------------------------------------------------
 #
-#   globals.properties : \uC2DC\uC2A4\uD15C 
-#   
+#   globals.properties : \uC2DC\uC2A4\uD15C
+#
 #-----------------------------------------------------------------------
 #   1.  key = value \uAD6C\uC870\uC785\uB2C8\uB2E4.
 #   2.  key\uAC12\uC740 \uACF5\uBC31\uBB38\uC790\uB97C \uD3EC\uD568\uBD88\uAC00, value\uAC12\uC740 \uACF5\uBC31\uBB38\uC790\uB97C \uAC00\uB2A5

 
 # DB\uC11C\uBC84 \uD0C0\uC785(ORACLE, MYSQL) - datasource \uBC0F sqlMap \uD30C\uC77C \uC9C0\uC815\uC5D0 \uC0AC\uC6A9\uB428
 Globals.DbType = mysql
-#Globals.driverClassName = com.mysql.jdbc.Driver
 Globals.driverClassName = core.log.jdbc.driver.MysqlDriver
 #\uAC1C\uBC1C
 Globals.DbUrl = jdbc:mysql://gne.edueum.com:3316/base?allowMultiQueries=true

 # MainPage Setting
 Globals.MainPage = /
 
-# \uC0AC\uC6A9 \uB3C4\uBA54\uC778 (http://127.0.0.1:8080) - IBM(DB2) : 9080port
-# \uB3C4\uBA54\uC778 \uC0AC\uC6A9\uC2DC tomcat\uC5D0 Path \uBD99\uC74C cait
+# mode : LOCAL, DEV, REAL
+#CMS.mode = DEV
+CMS.mode = LOCAL
+
+# \uC0AC\uC6A9 \uB3C4\uBA54\uC778
 Globals.Domain = http://devcms.foxedu.co.kr
 
 # 2\uB2E8\uACC4 \uAC8C\uC2DC\uD310 \uCD94\uAC00 \uAE30\uB2A5 (\uB313\uAE00, \uB9CC\uC871\uB3C4\uC870\uC0AC, \uC2A4\uD06C\uB7A9)

d3eb7c2

87b4508

base/src/main/webapp/WEB-INF/jsp/egovframework/mng/template/bottom.jsp

--- base/src/main/webapp/WEB-INF/jsp/egovframework/mng/template/bottom.jsp

+++ base/src/main/webapp/WEB-INF/jsp/egovframework/mng/template/bottom.jsp


 <!--popup-->
 <div class="dim"></div>
 
-<!--퍼블 layout-->
-<%--<script src="/resources/manage/js/_layout.js"></script>--%>
+<div class="popup lg" data-popup="encryptdecrypt">
+	<div class="pop-header">
+		<h1>암호화</h1>
+	</div>
+	<div class="pop-body">
+		<ul class="info-block-list">
+			<li>
+				<cite>암호화 </cite>
+				<div class="txt-area">
+					<div class="input-flex-box">
+						<input type="text" id="encrypt-val">
+						<button id="btn-encrypt-val" class="btn spot">확인</button>
+					</div>
+				</div>
+			</li>
+			<li>
+				<cite>복호화 결과 값</cite>
+				<div class="txt-area">
+					<div class="input-flex-box">
+						<input type="text" id="decrypt-val" disabled>
+					</div>
+				</div>
+			</li>
+		</ul>
+	</div>
+	<div class="pop-footer">
+		<div class="btn-flex-cont">
+			<button type="button" class="btn spot2" onclick="popupClose('popup')">확인</button>
+		</div>
+	</div>
+	<button type="button" class="pop-close"><span class="txt-hide">팝업닫기</span></button>
+</div>
 
 <script src="/resources/manage/js/jquery-ui.min.js"></script>
 <script src="/resources/manage/js/jquery.easing.1.3.js"></script>

d3eb7c2

87b4508

base/src/main/webapp/WEB-INF/jsp/egovframework/mng/template/top.jsp

--- base/src/main/webapp/WEB-INF/jsp/egovframework/mng/template/top.jsp

+++ base/src/main/webapp/WEB-INF/jsp/egovframework/mng/template/top.jsp

...	...	@@ -46,6 +46,7 @@
46	46	</a>
47	47	</h1>
48	48	<%-- 대메뉴 목록 --%>
	49	+ ${CMS_MODE}===
49	50	<nav class="site-gnb">
50	51	<ul>
51	52	<c:if test="${USER_INFO.userSe > 10 }">
...	...	@@ -58,6 +59,11 @@
58	59	<%-- <li><a href="<c:url value="/mng/evt/selectSchdulinfoList.do"/>" <c:if test="${param.menu eq 'EVENT_MANAGE' }">class="is-current"</c:if>>통합캘린더관리</a></li> --%>
59	60	<li><a href="<c:url value="/mng/sts/selectScrinStats.do?statsKind=H"/>" <c:if test="${param.menu eq 'STAT_MANAGE' }">class="is-current"</c:if>>통계관리</a></li>
60	61	<li><a href="<c:url value="/mng/uss/ion/bnr/selectBannerList.do?bannerTyCode=BAN001"/>" <c:if test="${param.menu eq 'ETC_MANAGE' }">class="is-current"</c:if>>기타관리</a></li>
	62	+
	63	+ <%-- 개발자 편의 용 실서버 배포 금지 배포하면 죽여버릴거야!!!!!!!!!!--%>
	64	+ <c:if test="${CMS_MODE eq 'LOCAL'}">
	65	+ <li><a href="#" onclick="popupOpen('encryptdecrypt')">복호화</a></li>
	66	+ </c:if>
61	67	</ul>
62	68	</nav>
63	69	</div>

d3eb7c2

87b4508

base/src/main/webapp/resources/common/js/common.js

--- base/src/main/webapp/resources/common/js/common.js

+++ base/src/main/webapp/resources/common/js/common.js

...	...	@@ -546,3 +546,22 @@
546	546	return fileExt;
547	547	}
548	548
	549	+
	550	+//복호화
	551	+$(document).on("click","#btn-encrypt-val", function(event){
	552	+ let encrypt = $("#encrypt-val").val();
	553	+
	554	+ $.ajax({
	555	+ type : "post"
	556	+ , dataType : "json"
	557	+ , data : {"encrypt" : encrypt}
	558	+ , url : "/sch/decrypt.do"
	559	+ , success : function(result) {
	560	+ if(result.code){
	561	+ $("#decrypt-val").val(result.code);
	562	+ }
	563	+ }, error:function(data) {
	564	+ console.log(data);
	565	+ }
	566	+ });
	567	+});

...	...	@@ -1,5 +1,27 @@
1	1	<?xml version="1.0" encoding="UTF-8"?>
2	2	<module type="JAVA_MODULE" version="4">
	3	+ <component name="FacetManager">
	4	+ <facet type="web" name="Web">
	5	+ <configuration>
	6	+ <descriptors>
	7	+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/base/src/main/webapp/WEB-INF/web.xml" />
	8	+ </descriptors>
	9	+ <webroots>
	10	+ <root url="file://$MODULE_DIR$/base/src/main/webapp" relative="/" />
	11	+ </webroots>
	12	+ </configuration>
	13	+ </facet>
	14	+ <facet type="web" name="Web2">
	15	+ <configuration>
	16	+ <descriptors>
	17	+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/base/target/base-1.0/WEB-INF/web.xml" />
	18	+ </descriptors>
	19	+ <webroots>
	20	+ <root url="file://$MODULE_DIR$/base/target/base-1.0" relative="/" />
	21	+ </webroots>
	22	+ </configuration>
	23	+ </facet>
	24	+ </component>
3	25	<component name="NewModuleRootManager" inherit-compiler-output="true">
4	26	<exclude-output />
5	27	<content url="file://$MODULE_DIR$" />

...	...	@@ -95,6 +95,9 @@
95	95
96	96	public static final String VOD_PROBER = EgovProperties.getProperty("Globals.VodProber");
97	97
	98	+ //CMS모드
	99	+ public static final String CMS_MODE = EgovProperties.getProperty("CMS.mode");
	100	+
98	101	// 웨일
99	102	public static final String CLIENT_ID = EgovProperties.getProperty("Globals.ClientId");
100	103	public static final String CLIENT_SECRET = EgovProperties.getProperty("Globals.ClientSecret");

...	...	@@ -6,6 +6,8 @@
6	6	import javax.servlet.http.HttpServletRequest;
7	7	import javax.servlet.http.HttpServletResponse;
8	8
	9	+import egovframework.com.cmm.service.JsonResponse;
	10	+import egovframework.module.utl.fcc.service.CryptoUtil;
9	11	import org.slf4j.Logger;
10	12	import org.slf4j.LoggerFactory;
11	13	import org.springframework.stereotype.Controller;
...	...	@@ -23,6 +25,7 @@
23	25	import egovframework.module.utl.fcc.service.EgovStringUtil;
24	26	import egovframework.rte.fdl.property.EgovPropertyService;
25	27	import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
	28	+import org.springframework.web.bind.annotation.ResponseBody;
26	29
27	30	//검색 서비스 컨트롤러 클래스
28	31	@Controller
...	...	@@ -210,6 +213,18 @@
210	213
211	214	return "/front/sch/EgovCmySearch";
212	215	}
213		-
	216	+
	217	+ //복호화
	218	+ @RequestMapping("/sch/decrypt.do")
	219	+ public @ResponseBody JsonResponse decrypt(HttpServletRequest request) throws Exception {
	220	+ JsonResponse res = new JsonResponse();
	221	+ res.setSuccess(true);
	222	+
	223	+ String encrypt = request.getParameter("encrypt");
	224	+ String decrypt = CryptoUtil.decrypt(encrypt, null);
	225	+ res.setCode(decrypt);
	226	+
	227	+ return res;
	228	+ }
214	229	}
215	230

...	...	@@ -6,6 +6,7 @@
6	6	import javax.servlet.http.HttpServletResponse;
7	7
8	8	import egovframework.module.sym.sit.service.SiteManageService;
	9	+import egovframework.module.sym.sit.service.SiteManageVO;
9	10	import egovframework.module.uat.uia.service.LoginService;
10	11	import egovframework.module.uat.uia.service.LoginVO;
11	12	import egovframework.com.cmm.service.EgovUserDetailsService;

...	...	@@ -1,7 +1,7 @@
1	1	#-----------------------------------------------------------------------
2	2	#
3		-# globals.properties : \uC2DC\uC2A4\uD15C
4		-#
	3	+# globals.properties : \uC2DC\uC2A4\uD15C
	4	+#
5	5	#-----------------------------------------------------------------------
6	6	# 1. key = value \uAD6C\uC870\uC785\uB2C8\uB2E4.
7	7	# 2. key\uAC12\uC740 \uACF5\uBC31\uBB38\uC790\uB97C \uD3EC\uD568\uBD88\uAC00, value\uAC12\uC740 \uACF5\uBC31\uBB38\uC790\uB97C \uAC00\uB2A5
...	...	@@ -18,7 +18,6 @@
18	18
19	19	# DB\uC11C\uBC84 \uD0C0\uC785(ORACLE, MYSQL) - datasource \uBC0F sqlMap \uD30C\uC77C \uC9C0\uC815\uC5D0 \uC0AC\uC6A9\uB428
20	20	Globals.DbType = mysql
21		-#Globals.driverClassName = com.mysql.jdbc.Driver
22	21	Globals.driverClassName = core.log.jdbc.driver.MysqlDriver
23	22	#\uAC1C\uBC1C
24	23	Globals.DbUrl = jdbc:mysql://gne.edueum.com:3316/base?allowMultiQueries=true
...	...	@@ -28,8 +27,11 @@
28	27	# MainPage Setting
29	28	Globals.MainPage = /
30	29
31		-# \uC0AC\uC6A9 \uB3C4\uBA54\uC778 (http://127.0.0.1:8080) - IBM(DB2) : 9080port
32		-# \uB3C4\uBA54\uC778 \uC0AC\uC6A9\uC2DC tomcat\uC5D0 Path \uBD99\uC74C cait
	30	+# mode : LOCAL, DEV, REAL
	31	+#CMS.mode = DEV
	32	+CMS.mode = LOCAL
	33	+
	34	+# \uC0AC\uC6A9 \uB3C4\uBA54\uC778
33	35	Globals.Domain = http://devcms.foxedu.co.kr
34	36
35	37	# 2\uB2E8\uACC4 \uAC8C\uC2DC\uD310 \uCD94\uAC00 \uAE30\uB2A5 (\uB313\uAE00, \uB9CC\uC871\uB3C4\uC870\uC0AC, \uC2A4\uD06C\uB7A9)

...	...	@@ -16,8 +16,38 @@
16	16	<!--popup-->
17	17	<div class="dim"></div>
18	18
19		-<!--퍼블 layout-->
20		-<%--<script src="/resources/manage/js/_layout.js"></script>--%>
	19	+<div class="popup lg" data-popup="encryptdecrypt">
	20	+ <div class="pop-header">
	21	+ <h1>암호화</h1>
	22	+ </div>
	23	+ <div class="pop-body">
	24	+ <ul class="info-block-list">
	25	+ <li>
	26	+ <cite>암호화 </cite>
	27	+ <div class="txt-area">
	28	+ <div class="input-flex-box">
	29	+ <input type="text" id="encrypt-val">
	30	+ <button id="btn-encrypt-val" class="btn spot">확인</button>
	31	+ </div>
	32	+ </div>
	33	+ </li>
	34	+ <li>
	35	+ <cite>복호화 결과 값</cite>
	36	+ <div class="txt-area">
	37	+ <div class="input-flex-box">
	38	+ <input type="text" id="decrypt-val" disabled>
	39	+ </div>
	40	+ </div>
	41	+ </li>
	42	+ </ul>
	43	+ </div>
	44	+ <div class="pop-footer">
	45	+ <div class="btn-flex-cont">
	46	+ <button type="button" class="btn spot2" onclick="popupClose('popup')">확인</button>
	47	+ </div>
	48	+ </div>
	49	+ <button type="button" class="pop-close"><span class="txt-hide">팝업닫기</span></button>
	50	+</div>
21	51
22	52	<script src="/resources/manage/js/jquery-ui.min.js"></script>
23	53	<script src="/resources/manage/js/jquery.easing.1.3.js"></script>

Delete comment