在分支上提交测试

GraduationDesignSystem/.classpath

@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>

GraduationDesignSystem/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+encoding//test/HibernateDaoImpTest/StudentDaoImpTest.java=UTF-8
+encoding//test/ServiceImpTest/StudentManagetImpTest.java=UTF-8
+<<<<<<< HEAD
+=======
+encoding/<project>=UTF-8
+>>>>>>> refs/remotes/origin/master

GraduationDesignSystem/WebContent/WEB-INF/.gitignore

@@ -0,0 +1 @@
+/applicationContext.xml

GraduationDesignSystem/WebContent/WEB-INF/applicationContext.xml

@@ -32,7 +32,16 @@
 		<property name="mappingResources">
 			<list>
 				<!-- 以下用来列出Hibernate映射文件 -->
-				<value>edu/nefu/gdms/beans/Student.hbm.xml</value>
+				<value>edu/nefu/gdms/domain/Student.hbm.xml</value>
+				<value>edu/nefu/gdms/domain/Teacher.hbm.xml</value>
+				<value>edu/nefu/gdms/domain/Systime.hbm.xml</value>
+				<value>edu/nefu/gdms/domain/Paper.hbm.xml</value>
+				<value>edu/nefu/gdms/domain/Tepascore.hbm.xml</value>
+				<value>edu/nefu/gdms/domain/Title.hbm.xml</value>
+
+				<value>edu/nefu/gdms/domain/Grour.hbm.xml</value> 
+				  <value>edu/nefu/gdms/domain/Log.hbm.xml</value> 
+
 			</list>
 		</property>
 		<!-- 定义Hibernate的SessionFactory的属性 -->
@@ -70,26 +79,81 @@
 		<!-- 指定在leePointcut切入点应用txAdvice事务增强处理 -->
 		<aop:advisor advice-ref="txAdvice" pointcut-ref="leePointcut" />
 	</aop:config>
+
+
+
 
 	<!-- Dao事物类 -->
-	<bean id="studentDao" class="edu.nefu.gdms.daoImpl.StudentDaoHibernate">
+	<bean id="studentDao" class="edu.nefu.gdms.daoImpl.StudentDaoHibernate" >
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="grourDao" class="edu.nefu.gdms.daoImpl.GrourDaoHibernate" >
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="systimeDao" class="edu.nefu.gdms.daoImpl.SystimeDaoHibernate" >
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="paperDao" class="edu.nefu.gdms.daoImpl.PaperDaoHibernate" >
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="teacherDao" class="edu.nefu.gdms.daoImpl.TeacherDaoHibernate">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="titleDao" class="edu.nefu.gdms.daoImpl.TitleDaoHibernate">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="tepascoreDao" class="edu.nefu.gdms.daoImpl.TepascoreDaoHibernate">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="logDao" class="edu.nefu.gdms.daoImpl.LogDaoHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory" />
 		</property>
 	</bean>
 
 	<!--业务逻辑类 -->
-	<bean id="studentManager" class="edu.nefu.gdms.serviceImpl.StudentManagerImpl">
-		<property name="dao">
-			<ref bean="studentDao" />
-		</property>
+	<bean id="studentManager" class="edu.nefu.gdms.serviceImpl.StudentManagerImpl" parent="managerTemplate"> 
+	</bean>
+	<bean id="teacherManager" class="edu.nefu.gdms.serviceImpl.TeacherManagerImpl" parent="managerTemplate"> 
 	</bean>
 
 	<!-- Action类 -->
 	<bean id="studentAction" class="edu.nefu.gdms.action.StudentAction">
-		<property name="studentManager">
+	 <property name="studentManager">
 			<ref bean="studentManager" />
-		</property>
+		</property>  
+	</bean>
+	<bean id="teacherAction" class="edu.nefu.gdms.action.TeacherAction">
+		 <property name="teacherManager">
+			<ref bean="teacherManager" />
+		</property>  
+	</bean>
+
+
+	<!-- 定义业务逻辑组件 -->
+	<bean id="managerTemplate" class="edu.nefu.gdms.service.util.ManagerTemplate">
+		<property name="studentDao" ref="studentDao" />
+		<property name="grourDao" ref="grourDao" />
+		<property name="logDao" ref="logDao" />
+		<property name="teacherDao" ref="teacherDao" />
+		<property name="systimeDao" ref="systimeDao" />
+		<property name="titleDao" ref="titleDao" />
+		<property name="tepascoreDao" ref="tepascoreDao" />
+		<property name="paperDao" ref="paperDao" />
 	</bean>
 
 	<!-- 系统默认配置参数 -->

GraduationDesignSystem/WebContent/login.html

@@ -1,10 +1,36 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
-<meta charset="UTF-8">
-<title>Insert title here</title>
+	<meta charset="UTF-8">
+	<title>毕业设计管理</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<link rel="stylesheet" type="text/css" href="static/css/main/bootstrap.min.css">
+	<link rel="stylesheet" href="text/css" href="static/css/main/login.css">
+	<script type="text/javascript" src="static/js/main/jquery.min.js"></script>
+	<script type="text/javascript" src="static/js/main/bootstrap.min.js"></script>
+
 </head>
 <body>
-hello world
+	<h1>毕业设计管理系统<sub>信息学院</sub></h1>
+	<div>
+		<div class="header">
+			<a href=""></a>
+			<div></div>
+		</div>
+		<div class="content">
+			<div class="student">
+				<div class="login-box">
+					<form action="student-login.action" method="post">
+						<div class="login-form">
+
+						</div>
+						<div>
+							<button type="button" class="btn btn-primary">Primary</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
 </body>
 </html>

GraduationDesignSystem/WebContent/static/css/main/login.css

@@ -0,0 +1,5 @@
+body {
+	font-family: "Microsoft Yahei";
+	font-size: 12px;
+	background: #fff url("static/images/background.jpg") center center no-repeat;
+}