Commit @9e6afaa164c87e301b0e1a208280f2c150ee5ec0

e8e8145

9e6afaa

base/Documents/MySql_기본데이터.sql

--- base/Documents/MySql_기본데이터.sql

+++ base/Documents/MySql_기본데이터.sql

...	...	@@ -183,7 +183,7 @@
183	183	'<p>학교명 : $SITE_NM$ <br />전화번호 : $PHONE_NO$ <br />팩스번호 : $FAX_NO$ <br />개인정보처리방침</p>',
184	184	'<p>학교명 : $SITE_NM$ <br />전화번호 : $PHONE_NO$ <br />팩스번호 : $FAX_NO$ <br />$SITE_NM$ 가입약관</p>',
185	185	'<p>학교명 : $SITE_NM$ <br />전화번호 : $PHONE_NO$ <br />팩스번호 : $FAX_NO$ <br />$SITE_NM$ 이메일수집거부</p>',
186		-'Y','','<p>학교명 : $SITE_NM$ <br />전화번호 : $PHONE_NO$ <br />팩스번호 : $FAX_NO$ <br />$SITE_NM$ 저작권신고서비스</p>','','개발','000-0000-0000','000-0000-0000','주소','N','N','Y','4','20','Y','Y','Y','6','LYTSRC_0000000000001','','SITE_201210250244444490.jpg','','슬로건대체텍스트','','');
	186	+'Y','','<p>학교명 : $SITE_NM$ <br />전화번호 : $PHONE_NO$ <br />팩스번호 : $FAX_NO$ <br />$SITE_NM$ 저작권신고서비스</p>','1','개발','000-0000-0000','000-0000-0000','주소','N','N','Y','4','20','Y','Y','Y','6','LYTSRC_0000000000001','','SITE_201210250244444490.jpg','','슬로건대체텍스트','','');
187	187
188	188	/* 기본 메뉴 생성 */
189	189	INSERT INTO comtnsitemnu (MENU_NM, MENU_ID, UPPER_MENU_ID, HTML_CN, EXPSR_USE_AT, USE_AT, HTML_USE_AT, CNTNTS_TY_CODE, URL, COMPOSITION_TY_CODE, PROGRM_ID, NWD_AT, STYLE_CN, SCRIPT_CN, FRST_REGISTER_PNTTM,

e8e8145

9e6afaa

base/src/main/java/egovframework/com/auth/service/impl/NaverLoginServiceImpl.java

--- base/src/main/java/egovframework/com/auth/service/impl/NaverLoginServiceImpl.java

+++ base/src/main/java/egovframework/com/auth/service/impl/NaverLoginServiceImpl.java


     private final static String REDIRECT_URI = "http://hufs.petapop.com/auth/login.do";
     private final static String SESSION_STATE = "oauth_state";
     /* 프로필 조회 API URL */
-    private final static String PROFILE_API_URL = "https://api.whalespace.io/oauth2/v1/userinfo";//"https://openapi.naver.com/v1/nid/me";//Api 종류 기본
+    private final static String PROFILE_API_URL = "https://api.whalespace.io/oauth2/v1/userinfo";
     
     //scope URL
     private final static String SCOPE_URL = "https://account.whalespace.io/directory/user.profile.readonly";

 		Response response = client.newCall(request).execute();
 		
 		return response.body().string();
-    	/*
-        OAuth20Service oauthService =new ServiceBuilder()
-                .apiKey(CLIENT_ID)
-                .apiSecret(CLIENT_SECRET)
-                .callback(REDIRECT_URI).build(NaverLoginApi.instance());
-
-        OAuthRequest request = new OAuthRequest(Verb.GET, PROFILE_API_URL, oauthService);
-        oauthService.signRequest(oauthToken, request);
-        Response response = request.send();
-        
-        return response.getBody();
-        */
     }
 }

e8e8145

9e6afaa

base/src/main/java/egovframework/com/auth/web/AuthController.java

--- base/src/main/java/egovframework/com/auth/web/AuthController.java

+++ base/src/main/java/egovframework/com/auth/web/AuthController.java


         //네이버 
         model.addAttribute("url", naverAuthUrl);
         
-        //return "dataeum/front/test/naverLogin";
         return "redirect:"+naverAuthUrl;
   	}
     

         
         NaverUser user = gson.fromJson(apiResult, NaverUser.class);
         if(user.getPrimaryEmail() != null) {
-			System.out.println("1. sessionId = " + session.getId());
-			System.out.println("result =====> " + user.toString());
-			
 			session.setAttribute("naverUser", user);
 			model.addAttribute("token", oauthToken.getAccessToken());
         }

 		printwriter.close();
 		
 	}
-	
-	@RequestMapping(value = "/auth/myinfo2.do")
-	public void myinfo(HttpServletRequest request,HttpServletResponse response) throws Exception {
-		String successYn = "Y";
-		String apiResult = "{\"primaryEmail\":\"tea01@gne.go.kr\",\"sid\":\"Ybzi5lxu7sa8AMhfPUm9Yu2urfxIfT4ZsVaPFvK6QEoP91u2jOn7RU6DKfpdaZu2\",\"userType\":\"tea\",\"name\":{\"givenName\":\"선생\",\"familyName\":\"고\",\"fullName\":\"선생 고\"},\"thumbnailPhotoUrl\":null,\"space\":{\"name\":\"한컴초등학교\",\"code\":\"HANCOM\"}}";
-		
-        JSONObject jo = new JSONObject();
-  		response.setContentType("application/json;charset=utf-8");
-
-		jo.put("successYn", successYn);
-		jo.put("items", apiResult);
-
-		PrintWriter printwriter = response.getWriter();
-		printwriter.println(jo.toString());
-		printwriter.flush();
-		printwriter.close();
-	}
-	
-	//네이버웨일 return auth
-  	@RequestMapping(value="/auth/test.do")
-  	public String test(@ModelAttribute("loginVO") LoginVO loginVO,HttpServletRequest request,HttpServletResponse response,ModelMap model, HttpSession session)throws Exception {
-  		
-        return "/auth/test";
-  	}
 	
 }

e8e8145

9e6afaa

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.driverClassName = com.mysql.jdbc.Driver
 Globals.driverClassName = core.log.jdbc.driver.MysqlDriver
 #\uac1c\ubc1c
-Globals.DbUrl = jdbc:mysql://gne.edueum.com:3306/base?allowMultiQueries=true
+Globals.DbUrl = jdbc:mysql://gne.edueum.com:3316/base?allowMultiQueries=true
 Globals.DbUser = base_user
 Globals.DbPw = base_pass
 

 
 #\uc5d1\uc140\ud15c\ud50c\ub9bf \ud3f4\ub354\uba85
 Globals.ExcelTemplateDirectory= xls
+
+

e8e8145

9e6afaa

base/src/main/resources/egovframework/spring/context-datasource.xml

--- base/src/main/resources/egovframework/spring/context-datasource.xml

+++ base/src/main/resources/egovframework/spring/context-datasource.xml


 		<property name="password" value="cait_base_pass"/>
 	</bean>
 	 -->
-	<!-- DB2 -->
-	<!-- 
-	<bean id="dataSource-db2" class="org.springframework.jndi.JndiObjectFactoryBean">  
-	    <property name="jndiName" value="java:comp/env/jdbc/cait" />  
-	</bean> 
-	 -->
-	 <!-- 
-	<bean id="dataSource-db2" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-		<property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver"/>
-		<property name="url" value="jdbc:db2://192.168.10.111:50000/CAIT" />
-		<property name="username" value="db2admin"/>
-		<property name="password" value="emt6417!"/>
-	</bean>
-	 -->
+	
 	<!-- MYSQL -->
 	<!-- 
 	<bean id="dataSource-mysql" class="org.springframework.jndi.JndiObjectFactoryBean">  

e8e8145

9e6afaa

base/src/main/resources/egovframework/spring/context-excel.xml

--- base/src/main/resources/egovframework/spring/context-excel.xml

+++ base/src/main/resources/egovframework/spring/context-excel.xml


 	xsi:schemaLocation="http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<!-- 
-	<bean id="excelZipService"	class="egovframework.rte.fdl.excel.impl.EgovExcelServiceImpl">
-		<property name="propertyPath" value="excelInfo.xml" />
-		<property name="mapClass" value="egovframework.com.sym.ccm.zip.service.impl.EgovCcmExcelZipMapping" />
-		<property name="sqlMapClient" ref="sqlMapClient" />
-	</bean>
-	 -->
 	<bean id="excelDownloadView" class="egovframework.com.cmm.service.ExcelDownloadView" />
 	
 	<bean class="org.springframework.web.servlet.view.BeanNameViewResolver">

e8e8145

9e6afaa

base/src/main/resources/egovframework/spring/context-mapper.xml

--- base/src/main/resources/egovframework/spring/context-mapper.xml

+++ base/src/main/resources/egovframework/spring/context-mapper.xml


 
 	<!-- SqlSession setup for MyBatis Database Layer -->
 	<bean id="sqlSession" class="org.mybatis.spring.SqlSessionFactoryBean">
-		<property name="dataSource" ref="dataSource-${Globals.DbType}" />
-		<property name="configLocation" value="classpath:/egovframework/mapper/mapper-config.xml" />
-		<property name="mapperLocations" value="classpath:/egovframework/mapper/${Globals.DbType}/*.xml" />
+		<property name="dataSource" ref="dataSource" />
+		<property name="configLocation" value="classpath:/egovframework/mapper/config/mapper-config.xml" />
+		<property name="mapperLocations">
+			<list>
+				<value>classpath:/egovframework/mapper/${Globals.DbType}/**/*_SQL.xml</value>
+			</list>
+		</property>
 	</bean>
 	
 	<!-- MapperConfigurer setup for MyBatis Database Layer with @Mapper("deptMapper") in DeptMapper Interface -->
 	<bean class="egovframework.rte.psl.dataaccess.mapper.MapperConfigurer">
-		<property name="basePackage" value="egovframework" />
+		<property name="basePackage" value="egovframework.**.service.impl" />
 	</bean>
     
 </beans>

e8e8145

base/src/main/webapp/clientaccesspolicy.xml (deleted)

--- base/src/main/webapp/clientaccesspolicy.xml

...	...	@@ -1,14 +0,0 @@
	1	-<?xml version="1.0" encoding="utf-8" ?>
	2	-<access-policy>
	3	- <cross-domain-access>
	4	- <policy>
	5	- <allow-from>
	6	- <domain uri="*"/>
	7	- </allow-from>
	8	- <grant-to>
	9	- <!-- <socket-resource port="4502-4534" protocol="tcp"/> -->
	10	- <resource path="/" include-subpaths="true"/>
	11	- </grant-to>
	12	- </policy>
	13	- </cross-domain-access>
	14	-</access-policy>(파일 끝에 줄바꿈 문자 없음)

e8e8145

base/src/main/webapp/crossdomain.xml (deleted)

--- base/src/main/webapp/crossdomain.xml

...	...	@@ -1,6 +0,0 @@
	1	-<?xml version="1.0"?>
	2	-<!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">
	3	-<cross-domain-policy>
	4	- <allow-access-from domain="*"/>
	5	- <!-- <allow-http-request-headers-from domain="" headers=""/> -->
	6	-</cross-domain-policy>

...	...	@@ -54,7 +54,6 @@
54	54	//네이버
55	55	model.addAttribute("url", naverAuthUrl);
56	56
57		- //return "dataeum/front/test/naverLogin";
58	57	return "redirect:"+naverAuthUrl;
59	58	}
60	59
...	...	@@ -73,9 +72,6 @@
73	72
74	73	NaverUser user = gson.fromJson(apiResult, NaverUser.class);
75	74	if(user.getPrimaryEmail() != null) {
76		- System.out.println("1. sessionId = " + session.getId());
77		- System.out.println("result =====> " + user.toString());
78		-
79	75	session.setAttribute("naverUser", user);
80	76	model.addAttribute("token", oauthToken.getAccessToken());
81	77	}
...	...	@@ -127,29 +123,5 @@
127	123	printwriter.close();
128	124
129	125	}
130		-
131		- @RequestMapping(value = "/auth/myinfo2.do")
132		- public void myinfo(HttpServletRequest request,HttpServletResponse response) throws Exception {
133		- String successYn = "Y";
134		- String apiResult = "{\"primaryEmail\":\"tea01@gne.go.kr\",\"sid\":\"Ybzi5lxu7sa8AMhfPUm9Yu2urfxIfT4ZsVaPFvK6QEoP91u2jOn7RU6DKfpdaZu2\",\"userType\":\"tea\",\"name\":{\"givenName\":\"선생\",\"familyName\":\"고\",\"fullName\":\"선생 고\"},\"thumbnailPhotoUrl\":null,\"space\":{\"name\":\"한컴초등학교\",\"code\":\"HANCOM\"}}";
135		-
136		- JSONObject jo = new JSONObject();
137		- response.setContentType("application/json;charset=utf-8");
138		-
139		- jo.put("successYn", successYn);
140		- jo.put("items", apiResult);
141		-
142		- PrintWriter printwriter = response.getWriter();
143		- printwriter.println(jo.toString());
144		- printwriter.flush();
145		- printwriter.close();
146		- }
147		-
148		- //네이버웨일 return auth
149		- @RequestMapping(value="/auth/test.do")
150		- public String test(@ModelAttribute("loginVO") LoginVO loginVO,HttpServletRequest request,HttpServletResponse response,ModelMap model, HttpSession session)throws Exception {
151		-
152		- return "/auth/test";
153		- }
154	126
155	127	} (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -34,7 +34,7 @@
34	34	private final static String REDIRECT_URI = "http://hufs.petapop.com/auth/login.do";
35	35	private final static String SESSION_STATE = "oauth_state";
36	36	/* 프로필 조회 API URL */
37		- private final static String PROFILE_API_URL = "https://api.whalespace.io/oauth2/v1/userinfo";//"https://openapi.naver.com/v1/nid/me";//Api 종류 기본
	37	+ private final static String PROFILE_API_URL = "https://api.whalespace.io/oauth2/v1/userinfo";
38	38
39	39	//scope URL
40	40	private final static String SCOPE_URL = "https://account.whalespace.io/directory/user.profile.readonly";
...	...	@@ -107,17 +107,5 @@
107	107	Response response = client.newCall(request).execute();
108	108
109	109	return response.body().string();
110		- /*
111		- OAuth20Service oauthService =new ServiceBuilder()
112		- .apiKey(CLIENT_ID)
113		- .apiSecret(CLIENT_SECRET)
114		- .callback(REDIRECT_URI).build(NaverLoginApi.instance());
115		-
116		- OAuthRequest request = new OAuthRequest(Verb.GET, PROFILE_API_URL, oauthService);
117		- oauthService.signRequest(oauthToken, request);
118		- Response response = request.send();
119		-
120		- return response.getBody();
121		- */
122	110	}
123	111	}

...	...	@@ -21,7 +21,7 @@
21	21	#Globals.driverClassName = com.mysql.jdbc.Driver
22	22	Globals.driverClassName = core.log.jdbc.driver.MysqlDriver
23	23	#\uac1c\ubc1c
24		-Globals.DbUrl = jdbc:mysql://gne.edueum.com:3306/base?allowMultiQueries=true
	24	+Globals.DbUrl = jdbc:mysql://gne.edueum.com:3316/base?allowMultiQueries=true
25	25	Globals.DbUser = base_user
26	26	Globals.DbPw = base_pass
27	27
...	...	@@ -52,3 +52,5 @@
52	52
53	53	#\uc5d1\uc140\ud15c\ud50c\ub9bf \ud3f4\ub354\uba85
54	54	Globals.ExcelTemplateDirectory= xls
	55	+
	56	+

...	...	@@ -32,20 +32,7 @@
32	32	<property name="password" value="cait_base_pass"/>
33	33	</bean>
34	34	-->
35		- <!-- DB2 -->
36		- <!--
37		- <bean id="dataSource-db2" class="org.springframework.jndi.JndiObjectFactoryBean">
38		- <property name="jndiName" value="java:comp/env/jdbc/cait" />
39		- </bean>
40		- -->
41		- <!--
42		- <bean id="dataSource-db2" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
43		- <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver"/>
44		- <property name="url" value="jdbc:db2://192.168.10.111:50000/CAIT" />
45		- <property name="username" value="db2admin"/>
46		- <property name="password" value="emt6417!"/>
47		- </bean>
48		- -->
	35	+
49	36	<!-- MYSQL -->
50	37	<!--
51	38	<bean id="dataSource-mysql" class="org.springframework.jndi.JndiObjectFactoryBean">

...	...	@@ -6,13 +6,6 @@
6	6	xsi:schemaLocation="http://www.springframework.org/schema/beans
7	7	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
8	8
9		- <!--
10		- <bean id="excelZipService" class="egovframework.rte.fdl.excel.impl.EgovExcelServiceImpl">
11		- <property name="propertyPath" value="excelInfo.xml" />
12		- <property name="mapClass" value="egovframework.com.sym.ccm.zip.service.impl.EgovCcmExcelZipMapping" />
13		- <property name="sqlMapClient" ref="sqlMapClient" />
14		- </bean>
15		- -->
16	9	<bean id="excelDownloadView" class="egovframework.com.cmm.service.ExcelDownloadView" />
17	10
18	11	<bean class="org.springframework.web.servlet.view.BeanNameViewResolver">

...	...	@@ -12,14 +12,18 @@
12	12
13	13	<!-- SqlSession setup for MyBatis Database Layer -->
14	14	<bean id="sqlSession" class="org.mybatis.spring.SqlSessionFactoryBean">
15		- <property name="dataSource" ref="dataSource-${Globals.DbType}" />
16		- <property name="configLocation" value="classpath:/egovframework/mapper/mapper-config.xml" />
17		- <property name="mapperLocations" value="classpath:/egovframework/mapper/${Globals.DbType}/*.xml" />
	15	+ <property name="dataSource" ref="dataSource" />
	16	+ <property name="configLocation" value="classpath:/egovframework/mapper/config/mapper-config.xml" />
	17	+ <property name="mapperLocations">
	18	+ <list>
	19	+ <value>classpath:/egovframework/mapper/${Globals.DbType}/*/_SQL.xml</value>
	20	+ </list>
	21	+ </property>
18	22	</bean>
19	23
20	24	<!-- MapperConfigurer setup for MyBatis Database Layer with @Mapper("deptMapper") in DeptMapper Interface -->
21	25	<bean class="egovframework.rte.psl.dataaccess.mapper.MapperConfigurer">
22		- <property name="basePackage" value="egovframework" />
	26	+ <property name="basePackage" value="egovframework.**.service.impl" />
23	27	</bean>
24	28
25	29	</beans> (파일 끝에 줄바꿈 문자 없음)

Delete comment