Skip to content

Commit 2d1ef97

Browse files
eeu12eeu12
eeu12
authored and
eeu12
committed
학식수정
1 parent 93832e8 commit 2d1ef97

File tree

3 files changed

+54
-24
lines changed

3 files changed

+54
-24
lines changed

‎ybusadmin/src/main/webapp/WEB-INF/spring/root-context.xml‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:tx="http://www.springframework.org/schema/tx"
45
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
56
http://www.springframework.org/schema/tx
67
http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
78

89
<!-- Root Context: defines shared resources visible to all other web components -->
910
<!-- org.springframework.jdbc.datasource.DriverManagerDataSource -->
1011

11-
12-
13-
<bean id="dataSourceMySQL" class="org.apache.commons.dbcp.BasicDataSource">
14-
<property name="driverClassName" value="com.mysql.jdbc.Driver" />
15-
<!-- <property name="url" value="jdbc:mysql://220.66.67.245:6612/cambusdb" /> -->
16-
<property name="url" value="jdbc:mysql://eeu1234.iptime.org:3306/cambusdb" />
17-
<property name="username" value="cbsadmin" />
18-
<property name="password" value="Thskxk4889!"/> </bean>
19-
<!--<bean id="dataSourceMySQL" class="org.apache.commons.dbcp.BasicDataSource">
20-
<property name="driverClassName" value="com.mysql.jdbc.Driver" />
21-
<property name="url" value="jdbc:mysql://192.168.9.20:3306/cambusdb" />
12+
13+
14+
<bean id="dataSourceMySQL"
15+
class="org.apache.commons.dbcp.BasicDataSource">
16+
<property name="driverClassName"
17+
value="com.mysql.jdbc.Driver" />
18+
<property name="url"
19+
value="jdbc:mysql://220.66.67.245:6612/cambusdb" />
20+
<!-- <property name="url" value="jdbc:mysql://eeu1234.iptime.org:3306/cambusdb"
21+
/> -->
2222
<property name="username" value="cbsadmin" />
23-
<property name="password" value="Thskxk4889" />
23+
<property name="password" value="Thskxk4889!" />
2424
</bean>
25-
-->
25+
<!--<bean id="dataSourceMySQL" class="org.apache.commons.dbcp.BasicDataSource">
26+
<property name="driverClassName" value="com.mysql.jdbc.Driver" /> <property
27+
name="url" value="jdbc:mysql://192.168.9.20:3306/cambusdb" /> <property name="username"
28+
value="cbsadmin" /> <property name="password" value="Thskxk4889" /> </bean> -->
2629

2730
<!-- log4j -->
28-
<bean id="log4jSource" class="net.sf.log4jdbc.Log4jdbcProxyDataSource">
31+
<bean id="log4jSource"
32+
class="net.sf.log4jdbc.Log4jdbcProxyDataSource">
2933
<constructor-arg ref="dataSourceMySQL"></constructor-arg>
3034
<property name="logFormatter">
3135
<bean class="net.sf.log4jdbc.tools.Log4JdbcCustomFormatter">
@@ -35,13 +39,16 @@
3539
</property>
3640
</bean>
3741

38-
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
42+
<bean id="sqlSessionFactory"
43+
class="org.mybatis.spring.SqlSessionFactoryBean">
3944
<property name="dataSource" ref="log4jSource" />
40-
<property name="mapperLocations" value="classpath*:com/test/spring/mapper/**/*.xml"></property>
45+
<property name="mapperLocations"
46+
value="classpath*:com/test/spring/mapper/**/*.xml"></property>
4147
<property name="configLocation" value="/WEB-INF/config.xml" />
4248
</bean>
4349

44-
<bean id="sqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
50+
<bean id="sqlSessionTemplate"
51+
class="org.mybatis.spring.SqlSessionTemplate">
4552
<constructor-arg index="0" ref="sqlSessionFactory" />
4653
</bean>
4754

@@ -51,10 +58,12 @@
5158
</bean>
5259

5360
<!-- 자바 파일에서 어노테이션 선언을 사용해서 트랜잭션 처리 -->
54-
<tx:annotation-driven transaction-manager="transactionManager"></tx:annotation-driven>
61+
<tx:annotation-driven
62+
transaction-manager="transactionManager"></tx:annotation-driven>
5563

5664
<!-- 자바 파일에서 어노테이션 선언을 사용해서 트랜잭션 처리 -->
57-
<tx:annotation-driven transaction-manager="transactionManager"></tx:annotation-driven>
65+
<tx:annotation-driven
66+
transaction-manager="transactionManager"></tx:annotation-driven>
5867

5968

6069

‎ybusadmin/src/main/webapp/WEB-INF/views/food/adminFoodInsert.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
%>
7777
7878
<h1 class="menuTitle">학식 정보 관리</h1>
79-
<h1 id="category" style="float:right; width:200px; height:50px; margin:15px; text-align:center;">등록</h1>
79+
<h1 id="category" style="float:right; width:200px; height:50px; margin:15px; text-align:center;"><%= location %></h1>
8080
8181
<div style="float: left; width: 99%; min-width: 1080px; margin: 5px;">
8282
<div id="col" style="width: 10%;">

‎ybusadmin/src/main/webapp/WEB-INF/views/user/getFoodCornerList.jsp‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,13 @@
503503
</div>
504504
<div id="cornerContainer">
505505
<div class="cornerBox">
506+
<c:set var="loc" value="<%= location %>" />
507+
<c:if test="${loc eq '생활관'}">
508+
<div id="cornerA" class="corner" onclick="dp_menu(0)">조식</div>
509+
</c:if>
510+
<c:if test="${loc eq '환과대' || loc eq '인성관'}">
506511
<div id="cornerA" class="corner" onclick="dp_menu(0)">코너 A</div>
512+
</c:if>
507513
<div class="cornerDetail down">
508514
<c:choose>
509515
<c:when test="${empty foodList or empty foodList[0].menu1}">
@@ -520,7 +526,12 @@
520526
</div>
521527
</div>
522528
<div class="cornerBox">
523-
<div id="cornerB" class="corner" onclick="dp_menu(1)">코너 B</div>
529+
<c:if test="${loc eq '생활관'}">
530+
<div id="cornerA" class="corner" onclick="dp_menu(1)">중식</div>
531+
</c:if>
532+
<c:if test="${loc eq '환과대' || loc eq '인성관'}">
533+
<div id="cornerA" class="corner" onclick="dp_menu(1)">코너 B</div>
534+
</c:if>
524535
<div class="cornerDetail">
525536
<c:choose>
526537
<c:when test="${empty foodList or empty foodList[1].menu1}">
@@ -537,7 +548,12 @@
537548
</div>
538549
</div>
539550
<div class="cornerBox">
540-
<div id="cornerC" class="corner" onclick="dp_menu(2)">코너 C</div>
551+
<c:if test="${loc eq '생활관'}">
552+
<div id="cornerC" class="corner" onclick="dp_menu(2)">석식</div>
553+
</c:if>
554+
<c:if test="${loc eq '환과대' || loc eq '인성관'}">
555+
<div id="cornerC" class="corner" onclick="dp_menu(2)">코너 C</div>
556+
</c:if>
541557
<div class="cornerDetail">
542558
<c:choose>
543559
<c:when test="${empty foodList or empty foodList[2].menu1}">
@@ -554,7 +570,12 @@
554570
</div>
555571
</div>
556572
<div class="cornerBox">
557-
<div id="cornerD" class="corner" onclick="dp_menu(3)">코너 D</div>
573+
<c:if test="${loc eq '생활관'}">
574+
<div id="cornerC" class="corner" onclick="dp_menu(3)">추가식</div>
575+
</c:if>
576+
<c:if test="${loc eq '환과대' || loc eq '인성관'}">
577+
<div id="cornerC" class="corner" onclick="dp_menu(3)">코너 D</div>
578+
</c:if>
558579
<div class="cornerDetail">
559580
<c:choose>
560581
<c:when test="${empty foodList or empty foodList[3].menu1}">

0 commit comments

Comments
 (0)