From f34366308f63ad240912122ce5130c8f92868db0 Mon Sep 17 00:00:00 2001
From: yansheng836 <sheng.yan836@gmail.com>
Date: Wed, 1 Jan 2020 16:31:53 +0800
Subject: [PATCH 1/2] refactor(encoding): change java/jsp/xml files encoding to
 utf8
---
 .../conf/applicationContext-action-api.xml" &#124; 2 +-
 .../classes/conf/applicationContext-dao.xml" &#124; 2 +-
 .../WebRoot/WEB-INF/classes/struts.xml" &#124; 2 +-
 .../SSHDemo/WebRoot/login.jsp" &#124; 2 +-
 .../SSHDemo/src/com/model/UserInfo.java" &#124; 116 +++++++++---------
 .../conf/applicationContext-action-api.xml" &#124; 2 +-
 .../src/conf/applicationContext-dao.xml" &#124; 2 +-
 .../SSHDemo/src/struts.xml" &#124; 2 +-
 .../WEB-INF/classes/conf/spring-mvc.xml" &#124; 2 +-
 .../WEB-INF/classes/conf/spring-orm.xml" &#124; 2 +-
 .../SpringMVCProj/WebRoot/WEB-INF/web.xml" &#124; 2 +-
 .../SpringMVCProj/WebRoot/addUser.jsp" &#124; 2 +-
 .../SpringMVCProj/WebRoot/displayUsers.jsp" &#124; 2 +-
 .../SpringMVCProj/src/com/dao/UserDao.java" &#124; 2 +-
 .../SpringMVCProj/src/com/model/User.java" &#124; 2 +-
 .../src/com/mvc/UserController.java" &#124; 2 +-
 .../src/com/service/UserService.java" &#124; 2 +-
 .../SpringMVCProj/src/conf/spring-mvc.xml" &#124; 2 +-
 .../SpringMVCProj/src/conf/spring-orm.xml" &#124; 2 +-
 .../ForumDemo/WebRoot/WEB-INF/web.xml" &#124; 2 +-
 .../ForumDemo/WebRoot/notelist.jsp" &#124; 10 +-
 .../ForumDemo/WebRoot/welcome.jsp" &#124; 4 +-
 .../JspAndServlet/WebRoot/login.jsp" &#124; 8 +-
 .../SimpleJavaBean/WebRoot/hellouser.jsp" &#124; 8 +-
 .../WebRoot/WEB-INF/web.xml" &#124; 2 +-
 .../StrutsInterceptLogin/WebRoot/login.jsp" &#124; 2 +-
 .../StrutsInterceptLogin/WebRoot/welcome.jsp" &#124; 2 +-
 .../src/action/HelloUserAction.java" &#124; 2 +-
 .../src/action/LoginAction.java" &#124; 6 +-
 .../src/action/UserLoginInterceptor.java" &#124; 6 +-
 .../src/service/CheckUser.java" &#124; 4 +-
 .../strutsDemo/WebRoot/calSum.jsp" &#124; 10 +-
 .../strutsDemo/WebRoot/negative.jsp" &#124; 6 +-
 .../strutsDemo/WebRoot/positive.jsp" &#124; 6 +-
 .../strutsDemo/src/action/myAction.java" &#124; 8 +-
 .../strutsValidate/WebRoot/calSum.jsp" &#124; 10 +-
 .../strutsValidate/WebRoot/negative.jsp" &#124; 6 +-
 .../strutsValidate/WebRoot/positive.jsp" &#124; 6 +-
 .../strutsValidate/src/action/myAction.java" &#124; 8 +-
 .../action/registerAction-validation.xml" &#124; 2 +-
 .../WebRoot/register.jsp" &#124; 12 +-
 .../WebRoot/registerSuccess.jsp" &#124; 2 +-
 .../src/action/registerAction-validation.xml" &#124; 2 +-
 .../src/action/registerAction.java" &#124; 2 +-
 .../SpringAOPDemo/bin/ApplicationContext.xml" &#124; 28 ++---
 .../SpringAOPDemo/src/Account.java" &#124; 2 +-
 .../SpringAOPDemo/src/AccountImpl.java" &#124; 6 +-
 .../SpringAOPDemo/src/AfterAdvice.java" &#124; 10 +-
 .../SpringAOPDemo/src/ApplicationContext.xml" &#124; 28 ++---
 .../SpringAOPDemo/src/AroundInterceptor.java" &#124; 6 +-
 .../SpringAOPDemo/src/BeforeAdvice.java" &#124; 10 +-
 .../SpringAOPDemo/src/Main.java" &#124; 4 +-
 .../bin/BaseOnInterface/bean.xml" &#124; 2 +-
 .../src/BaseOnInterface/HelloAbstract.java" &#124; 2 +-
 .../src/BaseOnInterface/SpringMain.java" &#124; 2 +-
 .../src/BaseOnInterface/bean.xml" &#124; 2 +-
 .../SpringSingleton/bin/Demo/bean.xml" &#124; 2 +-
 .../SpringSingleton/src/Demo/Main.java" &#124; 4 +-
 .../SpringSingleton/src/Demo/Random.java" &#124; 2 +-
 .../SpringSingleton/src/Demo/bean.xml" &#124; 2 +-
 .../WebRoot/WEB-INF/spring-servlet.xml" &#124; 2 +-
 .../WebRoot/WEB-INF/web.xml" &#124; 2 +-
 .../WebRoot/login.jsp" &#124; 6 +-
 .../WebRoot/register.jsp" &#124; 6 +-
 .../WebRoot/welcome.jsp" &#124; 2 +-
 .../src/Controller/LoginController.java" &#124; 4 +-
 .../src/Controller/RegisterController.java" &#124; 4 +-
 .../WebRoot/WEB-INF/spring-servlet.xml" &#124; 2 +-
 .../WebRoot/WEB-INF/web.xml" &#124; 2 +-
 .../SpringInterceptorDemo/WebRoot/login.jsp" &#124; 6 +-
 .../WebRoot/welcome.jsp" &#124; 2 +-
 .../src/Controller/LoginController.java" &#124; 4 +-
 .../src/Inteceptor/LoginInterceptor.java" &#124; 4 +-
 .../WebRoot/WEB-INF/spring-servlet.xml" &#124; 2 +-
 .../SpringMVCDemo/WebRoot/WEB-INF/web.xml" &#124; 2 +-
 .../SpringMVCDemo/WebRoot/login/hello.jsp" &#124; 2 +-
 .../SpringMVCDemo/WebRoot/welcome.jsp" &#124; 2 +-
 .../src/com/mvc/rest/RestController.java" &#124; 2 +-
 .../WebRoot/WEB-INF/spring-servlet.xml" &#124; 2 +-
 .../WebRoot/WEB-INF/web.xml" &#124; 2 +-
 .../WebRoot/login.jsp" &#124; 6 +-
 .../WebRoot/register.jsp" &#124; 6 +-
 .../WebRoot/welcome.jsp" &#124; 2 +-
 .../src/Controller/LoginController.java" &#124; 4 +-
 .../src/Controller/RegisterController.java" &#124; 4 +-
 .../WebRoot/WEB-INF/spring-servlet.xml" &#124; 2 +-
 .../WebRoot/WEB-INF/web.xml" &#124; 2 +-
 .../WebRoot/login.jsp" &#124; 6 +-
 .../WebRoot/welcome.jsp" &#124; 2 +-
 .../src/Controller/LoginController.java" &#124; 4 +-
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/com/HibernateMain.java" &#124; 2 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../HibernateDemo/bin/Model/UserInfo.hbm.xml" &#124; 40 +++---
 .../HibernateDemo/bin/hibernate.cfg.xml" &#124; 2 +-
 .../HibernateDemo/src/Model/UserInfo.hbm.xml" &#124; 40 +++---
 .../HibernateDemo/src/com/HibernateMain.java" &#124; 2 +-
 .../HibernateDemo/src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Account.hbm.xml" &#124; 42 +++----
 .../HibernateHQLDemo/bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Account.hbm.xml" &#124; 42 +++----
 .../src/com/HibernateMain.java" &#124; 4 +-
 .../HibernateHQLDemo/src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Account.hbm.xml" &#124; 42 +++----
 .../bin/Model/UserInfo.hbm.xml" &#124; 40 +++---
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Account.hbm.xml" &#124; 42 +++----
 .../src/Model/UserInfo.hbm.xml" &#124; 40 +++---
 .../src/com/HibernateMain.java" &#124; 4 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Account.hbm.xml" &#124; 42 +++----
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Account.hbm.xml" &#124; 42 +++----
 .../src/com/HibernateMain.java" &#124; 8 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Account.hbm.xml" &#124; 42 +++----
 .../HibernatePKDemo/bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Account.hbm.xml" &#124; 42 +++----
 .../src/com/HibernateMain.java" &#124; 2 +-
 .../HibernatePKDemo/src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Account.hbm.xml" &#124; 42 +++----
 .../bin/Model/UserInfo.hbm.xml" &#124; 40 +++---
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Account.hbm.xml" &#124; 42 +++----
 .../src/Model/UserInfo.hbm.xml" &#124; 40 +++---
 .../src/com/HibernateMain.java" &#124; 4 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Account.hbm.xml" &#124; 42 +++----
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Account.hbm.xml" &#124; 42 +++----
 .../src/com/HibernateMain.java" &#124; 10 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Account.hbm.xml" &#124; 42 +++----
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Account.hbm.xml" &#124; 42 +++----
 .../src/com/HibernateMain.java" &#124; 12 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Account.hbm.xml" &#124; 60 ++++-----
 .../HIbernateSeniorCacheDemo/bin/ehcache.xml" &#124; 2 +-
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Account.hbm.xml" &#124; 60 ++++-----
 .../src/com/HibernateMain.java" &#124; 4 +-
 .../HIbernateSeniorCacheDemo/src/ehcache.xml" &#124; 2 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Card.hbm.xml" &#124; 42 +++----
 .../bin/Model/Person.hbm.xml" &#124; 40 +++---
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Card.hbm.xml" &#124; 42 +++----
 .../src/Model/Person.hbm.xml" &#124; 40 +++---
 .../src/Model/Person.java" &#124; 2 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../src/listener/UserInfoListener.java" &#124; 12 +-
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../src/interceptor/UserInfoInterceptor.java" &#124; 4 +-
 .../bin/Model/Card.hbm.xml" &#124; 40 +++---
 .../bin/Model/Person.hbm.xml" &#124; 52 ++++----
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Card.hbm.xml" &#124; 40 +++---
 .../src/Model/Person.hbm.xml" &#124; 52 ++++----
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/com/HibernateMain.java" &#124; 6 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Card.hbm.xml" &#124; 40 +++---
 .../bin/Model/Person.hbm.xml" &#124; 48 ++++----
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Card.hbm.xml" &#124; 40 +++---
 .../src/Model/Person.hbm.xml" &#124; 48 ++++----
 .../src/Model/Person.java" &#124; 2 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Card.hbm.xml" &#124; 46 +++----
 .../bin/Model/Person.hbm.xml" &#124; 46 +++----
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Card.hbm.xml" &#124; 46 +++----
 .../src/Model/Person.hbm.xml" &#124; 46 +++----
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/Model/Course.hbm.xml" &#124; 40 +++---
 .../bin/Model/Student.hbm.xml" &#124; 38 +++---
 .../bin/hibernate.cfg.xml" &#124; 2 +-
 .../src/Model/Course.hbm.xml" &#124; 40 +++---
 .../src/Model/Student.hbm.xml" &#124; 38 +++---
 .../src/hibernate.cfg.xml" &#124; 2 +-
 .../bin/ApplicationContext.xml" &#124; 2 +-
 .../src/ApplicationContext.xml" &#124; 2 +-
 .../bin/ApplicationContext.xml" &#124; 2 +-
 .../bin/Model/UserInfo.hbm.xml" &#124; 40 +++---
 .../src/ApplicationContext.xml" &#124; 2 +-
 .../src/Model/UserInfo.hbm.xml" &#124; 40 +++---
 .../bin/ApplicationContext.xml" &#124; 2 +-
 .../src/ApplicationContext.xml" &#124; 2 +-
 197 files changed, 1282 insertions(+), 1282 deletions(-)
diff --git "a/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/conf/applicationContext-action-api.xml" "b/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/conf/applicationContext-action-api.xml"
index 8469812..f397539 100644
--- "a/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/conf/applicationContext-action-api.xml"
+++ "b/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/conf/applicationContext-action-api.xml"
@@ -11,4 +11,4 @@
 	<bean id="helloworld">
 		<property name="hws" ref="helloworldservice"/>
 	</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/conf/applicationContext-dao.xml" "b/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/conf/applicationContext-dao.xml"
index 63119c9..ebc790f 100644
--- "a/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/conf/applicationContext-dao.xml"
+++ "b/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/conf/applicationContext-dao.xml"
@@ -33,4 +33,4 @@
 	 <property name="sessionFactory" ref="sessionFactory"/> 
 </bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/struts.xml" "b/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/struts.xml"
index 0a92b46..3c0720f 100644
--- "a/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/struts.xml"
+++ "b/347円254円25410円347円253円240円/SSHDemo/WebRoot/WEB-INF/classes/struts.xml"
@@ -11,4 +11,4 @@
 			<result name="failure">/login.jsp</result>
 		</action>		
 	</package>	
-</struts>
\ No newline at end of file
+</struts>
diff --git "a/347円254円25410円347円253円240円/SSHDemo/WebRoot/login.jsp" "b/347円254円25410円347円253円240円/SSHDemo/WebRoot/login.jsp"
index 978c0ec..81ffce7 100644
--- "a/347円254円25410円347円253円240円/SSHDemo/WebRoot/login.jsp"
+++ "b/347円254円25410円347円253円240円/SSHDemo/WebRoot/login.jsp"
@@ -19,4 +19,4 @@
 		</s:form>
 		
 	</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/master...utf8.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/master...utf8.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>		
</body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/347円254円25410円347円253円240円/SSHDemo/src/com/model/UserInfo.java" "b/347円254円25410円347円253円240円/SSHDemo/src/com/model/UserInfo.java"
index 8f440d9..d41802c 100644
--- "a/347円254円25410円347円253円240円/SSHDemo/src/com/model/UserInfo.java"
+++ "b/347円254円25410円347円253円240円/SSHDemo/src/com/model/UserInfo.java"
@@ -1,58 +1,58 @@
-package com.model;
-
-/**
- * UserInfo entity. @author MyEclipse Persistence Tools
- */
-
-public class UserInfo implements java.io.Serializable {
-
-	// Fields
-
-	private Long id;
-	private String username;
-	private String password;
-
-	// Constructors
-
-	/** default constructor */
-	public UserInfo() {
-	}
-
-	/** minimal constructor */
-	public UserInfo(String username) {
-		this.username = username;
-	}
-
-	/** full constructor */
-	public UserInfo(String username, String password) {
-		this.username = username;
-		this.password = password;
-	}
-
-	// Property accessors
-
-	public Long getId() {
-		return this.id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getUsername() {
-		return this.username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getPassword() {
-		return this.password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-}
\ No newline at end of file
+package com.model;
+
+/**
+ * UserInfo entity. @author MyEclipse Persistence Tools
+ */
+
+public class UserInfo implements java.io.Serializable {
+
+	// Fields
+
+	private Long id;
+	private String username;
+	private String password;
+
+	// Constructors
+
+	/** default constructor */
+	public UserInfo() {
+	}
+
+	/** minimal constructor */
+	public UserInfo(String username) {
+		this.username = username;
+	}
+
+	/** full constructor */
+	public UserInfo(String username, String password) {
+		this.username = username;
+		this.password = password;
+	}
+
+	// Property accessors
+
+	public Long getId() {
+		return this.id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getUsername() {
+		return this.username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return this.password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+}
diff --git "a/347円254円25410円347円253円240円/SSHDemo/src/conf/applicationContext-action-api.xml" "b/347円254円25410円347円253円240円/SSHDemo/src/conf/applicationContext-action-api.xml"
index 8469812..f397539 100644
--- "a/347円254円25410円347円253円240円/SSHDemo/src/conf/applicationContext-action-api.xml"
+++ "b/347円254円25410円347円253円240円/SSHDemo/src/conf/applicationContext-action-api.xml"
@@ -11,4 +11,4 @@
 	<bean id="helloworld">
 		<property name="hws" ref="helloworldservice"/>
 	</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円25410円347円253円240円/SSHDemo/src/conf/applicationContext-dao.xml" "b/347円254円25410円347円253円240円/SSHDemo/src/conf/applicationContext-dao.xml"
index 63119c9..ebc790f 100644
--- "a/347円254円25410円347円253円240円/SSHDemo/src/conf/applicationContext-dao.xml"
+++ "b/347円254円25410円347円253円240円/SSHDemo/src/conf/applicationContext-dao.xml"
@@ -33,4 +33,4 @@
 	 <property name="sessionFactory" ref="sessionFactory"/> 
 </bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円25410円347円253円240円/SSHDemo/src/struts.xml" "b/347円254円25410円347円253円240円/SSHDemo/src/struts.xml"
index 0a92b46..3c0720f 100644
--- "a/347円254円25410円347円253円240円/SSHDemo/src/struts.xml"
+++ "b/347円254円25410円347円253円240円/SSHDemo/src/struts.xml"
@@ -11,4 +11,4 @@
 			<result name="failure">/login.jsp</result>
 		</action>		
 	</package>	
-</struts>
\ No newline at end of file
+</struts>
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/classes/conf/spring-mvc.xml" "b/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/classes/conf/spring-mvc.xml"
index f2c691f..db8ff90 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/classes/conf/spring-mvc.xml"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/classes/conf/spring-mvc.xml"
@@ -27,4 +27,4 @@
 </mvc:interceptor> 
 </mvc:interceptors> 
 
-</beans> 
\ No newline at end of file
+</beans> 
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/classes/conf/spring-orm.xml" "b/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/classes/conf/spring-orm.xml"
index 1a4b361..b6c46c0 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/classes/conf/spring-orm.xml"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/classes/conf/spring-orm.xml"
@@ -80,4 +80,4 @@ http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 		<property name="sessionFactory" ref="sessionFactory"/>
 	</bean>
 
-</beans> 
\ No newline at end of file
+</beans> 
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/web.xml" "b/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/web.xml"
index 5e863a3..737bc10 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/web.xml"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/WEB-INF/web.xml"
@@ -32,4 +32,4 @@
 </servlet-mapping> 
 
 
-</web-app> 
\ No newline at end of file
+</web-app> 
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/addUser.jsp" "b/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/addUser.jsp"
index f03e589..dd62ce7 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/addUser.jsp"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/addUser.jsp"
@@ -16,4 +16,4 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 <input type="submit" value="添加用户"> 
 </form> 
 </body> 
-</html> 
\ No newline at end of file
+</html> 
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/displayUsers.jsp" "b/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/displayUsers.jsp"
index fcce3a4..3850545 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/displayUsers.jsp"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/WebRoot/displayUsers.jsp"
@@ -29,4 +29,4 @@
 </tbody> 
 </table> 
 </body> 
-</html> 
\ No newline at end of file
+</html> 
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/src/com/dao/UserDao.java" "b/347円254円25410円347円253円240円/SpringMVCProj/src/com/dao/UserDao.java"
index f0b2c3e..5961cfa 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/src/com/dao/UserDao.java"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/src/com/dao/UserDao.java"
@@ -49,4 +49,4 @@ public void modifyUser(User user) {
 query.setInteger(2, user.getId()); 
 query.executeUpdate(); 
 }
-} 
\ No newline at end of file
+} 
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/src/com/model/User.java" "b/347円254円25410円347円253円240円/SpringMVCProj/src/com/model/User.java"
index 09c7998..a446368 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/src/com/model/User.java"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/src/com/model/User.java"
@@ -47,4 +47,4 @@ public void setAge(Integer age) {
 this.age = age; 
 } 
 
-} 
\ No newline at end of file
+} 
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/src/com/mvc/UserController.java" "b/347円254円25410円347円253円240円/SpringMVCProj/src/com/mvc/UserController.java"
index 60128c7..2470ac6 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/src/com/mvc/UserController.java"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/src/com/mvc/UserController.java"
@@ -60,4 +60,4 @@ public String modifyUser(User user){
 
 } 
 
-} 
\ No newline at end of file
+} 
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/src/com/service/UserService.java" "b/347円254円25410円347円253円240円/SpringMVCProj/src/com/service/UserService.java"
index 84d342f..98141ae 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/src/com/service/UserService.java"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/src/com/service/UserService.java"
@@ -41,4 +41,4 @@ public void modifyUser(User user) {
 userDao.modifyUser(user); 
 } 
 
-} 
\ No newline at end of file
+} 
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/src/conf/spring-mvc.xml" "b/347円254円25410円347円253円240円/SpringMVCProj/src/conf/spring-mvc.xml"
index f2c691f..db8ff90 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/src/conf/spring-mvc.xml"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/src/conf/spring-mvc.xml"
@@ -27,4 +27,4 @@
 </mvc:interceptor> 
 </mvc:interceptors> 
 
-</beans> 
\ No newline at end of file
+</beans> 
diff --git "a/347円254円25410円347円253円240円/SpringMVCProj/src/conf/spring-orm.xml" "b/347円254円25410円347円253円240円/SpringMVCProj/src/conf/spring-orm.xml"
index 1a4b361..b6c46c0 100644
--- "a/347円254円25410円347円253円240円/SpringMVCProj/src/conf/spring-orm.xml"
+++ "b/347円254円25410円347円253円240円/SpringMVCProj/src/conf/spring-orm.xml"
@@ -80,4 +80,4 @@ http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 		<property name="sessionFactory" ref="sessionFactory"/>
 	</bean>
 
-</beans> 
\ No newline at end of file
+</beans> 
diff --git "a/347円254円2543円347円253円240円/ForumDemo/WebRoot/WEB-INF/web.xml" "b/347円254円2543円347円253円240円/ForumDemo/WebRoot/WEB-INF/web.xml"
index 033ac5a..32af7f5 100644
--- "a/347円254円2543円347円253円240円/ForumDemo/WebRoot/WEB-INF/web.xml"
+++ "b/347円254円2543円347円253円240円/ForumDemo/WebRoot/WEB-INF/web.xml"
@@ -8,4 +8,4 @@
 	 <servlet-name>Enter</servlet-name>
 	 <url-pattern>/servlet/Enter</url-pattern>
 	</servlet-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git "a/347円254円2543円347円253円240円/ForumDemo/WebRoot/notelist.jsp" "b/347円254円2543円347円253円240円/ForumDemo/WebRoot/notelist.jsp"
index 876ede0..380f0d8 100644
--- "a/347円254円2543円347円253円240円/ForumDemo/WebRoot/notelist.jsp"
+++ "b/347円254円2543円347円253円240円/ForumDemo/WebRoot/notelist.jsp"
@@ -4,16 +4,16 @@
 <!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
<link rel="stylesheet" href="/common/contrast.css" type="text/css" media="all" />
<meta name="robots" content="noindex,nofollow">
<meta name="robots" content="none">
<meta name="robots" content="noarchive">
<meta name="Googlebot" content="noarchive">

- <title>������Ϣ�б�</title>
+ <title>留言信息列表</title>
 </head>
 
 <body><div class="naked_container">
- 	<h2>����������Ϣ���£�</h2><br />
+ 	<h2>所有留言信息如下:</h2><br />
 	<table class="structure">
 		<tr>
- 			<th>���Ա���</th>
- 			<th>��������</th>
- 			<th>����ɦ��</th>
+ 			<th>留言标题</th>
+ 			<th>作者姓名</th>
+ 			<th>发布时间</th>
 		</tr>
 		<% NoteBean noteBean = new NoteBean(); diff --git "a/347円254円2543円347円253円240円/ForumDemo/WebRoot/welcome.jsp" "b/347円254円2543円347円253円240円/ForumDemo/WebRoot/welcome.jsp" index 7c8efeb..90af70d 100644 --- "a/347円254円2543円347円253円240円/ForumDemo/WebRoot/welcome.jsp" +++ "b/347円254円2543円347円253円240円/ForumDemo/WebRoot/welcome.jsp" @@ -2,14 +2,14 @@ <!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<title>��ӭ������̳</title>
+<title>欢迎进入论坛</title>
 </head>
 <body>
 <form name="form1" action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/servlet/Enter" method="POST">
 	
 		<div class="naked_tr"> 			 
-<input type="submit" name="logon" value="������̳" />			
+<input type="submit" name="logon" value="进入论坛" />			
 			
 		</div>
 	
diff --git "a/347円254円2543円347円253円240円/JspAndServlet/WebRoot/login.jsp" "b/347円254円2543円347円253円240円/JspAndServlet/WebRoot/login.jsp"
index a5365c7..12677cd 100644
--- "a/347円254円2543円347円253円240円/JspAndServlet/WebRoot/login.jsp"
+++ "b/347円254円2543円347円253円240円/JspAndServlet/WebRoot/login.jsp"
@@ -7,17 +7,17 @@
 	<form name="form1" action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/servlet/Validator" method="POST">
 		
 			<div class="naked_tr">-				 �û�����
+				 用户名:
 				 <input type="text" name="username" id="username" />
 			</div>
 			<div class="naked_tr">-				 �� �룺
+				 密 码:
 				 <input type="password" name="password" id="password" />
 			</div>
 			<div class="naked_tr"> 				 
-	<input type="submit" name="logon" value="��1⁄4" /> 
-				<input type="reset" name="reset" value="����" />
+	<input type="submit" name="logon" value="登录" /> 
+				<input type="reset" name="reset" value="重置" />
 				
 			</div>
 		
diff --git "a/347円254円2543円347円253円240円/SimpleJavaBean/WebRoot/hellouser.jsp" "b/347円254円2543円347円253円240円/SimpleJavaBean/WebRoot/hellouser.jsp"
index 5ed8ede..605228d 100644
--- "a/347円254円2543円347円253円240円/SimpleJavaBean/WebRoot/hellouser.jsp"
+++ "b/347円254円2543円347円253円240円/SimpleJavaBean/WebRoot/hellouser.jsp"
@@ -14,11 +14,11 @@
 		<title>Hello,User</title>
 	</head>
 	<body>
-		<h1>Hello,my name is ����.What's your name?</h1>
+		<h1>Hello,my name is 张三.What's your name?</h1>
 		<form method = "get" action = "/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/responseuser.jsp">
 			<input type = "text" name = "username" size = "25"><br>
-			<input type = "submit" value = "�ύ">
-			<input type = "reset" value = "����">
+			<input type = "submit" value = "提交">
+			<input type = "reset" value = "重置">
 		</form>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/WEB-INF/web.xml" "b/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/WEB-INF/web.xml"
index 14641a4..e52a959 100644
--- "a/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/WEB-INF/web.xml"
+++ "b/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/WEB-INF/web.xml"
@@ -10,4 +10,4 @@
 <filter-name>struts2</filter-name>
 <url-pattern>/*</url-pattern>
 </filter-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git "a/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/login.jsp" "b/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/login.jsp"
index 5e63ae3..8b2de90 100644
--- "a/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/login.jsp"
+++ "b/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/login.jsp"
@@ -15,4 +15,4 @@
 <s:submit value="登录"/>
 </s:form>
 </body>
- </html>
\ No newline at end of file
+ </html>
diff --git "a/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/welcome.jsp" "b/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/welcome.jsp"
index db7e98c..2df8c01 100644
--- "a/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/welcome.jsp"
+++ "b/347円254円2544円347円253円240円/StrutsInterceptLogin/WebRoot/welcome.jsp"
@@ -12,4 +12,4 @@
 <s:property value="username"/>,欢迎光临
 </div> 
 </body>
- </html>
\ No newline at end of file
+ </html>
diff --git "a/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/HelloUserAction.java" "b/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/HelloUserAction.java"
index d7921b4..c2c7609 100644
--- "a/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/HelloUserAction.java"
+++ "b/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/HelloUserAction.java"
@@ -15,4 +15,4 @@ public void setUsername(String username) {
 public String execute() throws Exception {
 return SUCCESS;
 }
-}
\ No newline at end of file
+}
diff --git "a/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/LoginAction.java" "b/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/LoginAction.java"
index 91a82fa..82f54c5 100644
--- "a/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/LoginAction.java"
+++ "b/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/LoginAction.java"
@@ -12,10 +12,10 @@ public class LoginAction extends ActionSupport {
 private String password;
 
 public String execute() throws Exception {
- // ����session
+ // 设置session
 Map sessionMap = ActionContext.getContext().getSession();
 sessionMap.put("username", username);
- // ��֤�û�
+ // 验证用户
 if ( CheckUser.isUser(username, password) ) { 
 return SUCCESS;
 }
@@ -38,4 +38,4 @@ public String getPassword() {
 public void setPassword(String password) {
 this.password = password;
 }
-}
\ No newline at end of file
+}
diff --git "a/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/UserLoginInterceptor.java" "b/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/UserLoginInterceptor.java"
index d5def0f..acb2569 100644
--- "a/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/UserLoginInterceptor.java"
+++ "b/347円254円2544円347円253円240円/StrutsInterceptLogin/src/action/UserLoginInterceptor.java"
@@ -11,13 +11,13 @@ public class UserLoginInterceptor extends AbstractInterceptor {
 	private static final long serialVersionUID = 1L;
 
 	public String intercept(ActionInvocation arg0) throws Exception {
- 	// �ж��Ƿ�����Ϊ��1⁄4����(login),��������������
+ 	// 判断是否请求为登录界面(login),如果是则不拦截
 if (LoginAction.class == arg0.getAction().getClass())
 {
 return arg0.invoke();
 }
 
- // ��������������ҳ�棬��������
+ // 如果是请求其他页面,进行拦截
 Map sessionMap = arg0.getInvocationContext().getSession();
 if (null == sessionMap.get("username"))
 {
@@ -27,4 +27,4 @@ public String intercept(ActionInvocation arg0) throws Exception {
 
 return arg0.invoke();
 }
-}
\ No newline at end of file
+}
diff --git "a/347円254円2544円347円253円240円/StrutsInterceptLogin/src/service/CheckUser.java" "b/347円254円2544円347円253円240円/StrutsInterceptLogin/src/service/CheckUser.java"
index 35af81a..67b95f2 100644
--- "a/347円254円2544円347円253円240円/StrutsInterceptLogin/src/service/CheckUser.java"
+++ "b/347円254円2544円347円253円240円/StrutsInterceptLogin/src/service/CheckUser.java"
@@ -1,7 +1,7 @@
 package service;
 
 public class CheckUser {
- //�ж��û��Ƿ�����
+ //判断用户是否存在
 	 public static boolean isUser(String username, String password)
 	 {
 	 String name = username.trim();
@@ -13,4 +13,4 @@ public static boolean isUser(String username, String password)
 	 }
 	 return false;
 	 }
-	} 
\ No newline at end of file
+	} 
diff --git "a/347円254円2544円347円253円240円/strutsDemo/WebRoot/calSum.jsp" "b/347円254円2544円347円253円240円/strutsDemo/WebRoot/calSum.jsp"
index d0202c6..25ff6fe 100644
--- "a/347円254円2544円347円253円240円/strutsDemo/WebRoot/calSum.jsp"
+++ "b/347円254円2544円347円253円240円/strutsDemo/WebRoot/calSum.jsp"
@@ -3,16 +3,16 @@
 
 <html>
 <head>
- <title>����������</title>
+ <title>输入操作数</title>
 </head>
 
 <body>
- ����
+ 求和
 <br/>
 <s:form action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/mystruts/calSum"> 
- <s:textfield name="num1" label="��1"/>
- <s:textfield name="num2" label="��2" /> 
- <s:submit value="����" /> 
+ <s:textfield name="num1" label="数1"/>
+ <s:textfield name="num2" label="数2" /> 
+ <s:submit value="求和" /> 
 </s:form>
 </body>
 </html>
diff --git "a/347円254円2544円347円253円240円/strutsDemo/WebRoot/negative.jsp" "b/347円254円2544円347円253円240円/strutsDemo/WebRoot/negative.jsp"
index 1315e91..20afae2 100644
--- "a/347円254円2544円347円253円240円/strutsDemo/WebRoot/negative.jsp"
+++ "b/347円254円2544円347円253円240円/strutsDemo/WebRoot/negative.jsp"
@@ -3,11 +3,11 @@
 
 <html>
 <head>
- <title>��ʾ��</title>
+ <title>显示和</title>
 </head>
 
 <body>
- ������0��<h1><s:property value="sum" /></h1>
+ 结果小于0,<h1><s:property value="sum" /></h1>
 
 </body>
- </html> 
\ No newline at end of file
+ </html> 
diff --git "a/347円254円2544円347円253円240円/strutsDemo/WebRoot/positive.jsp" "b/347円254円2544円347円253円240円/strutsDemo/WebRoot/positive.jsp"
index fde4184..d01c3af 100644
--- "a/347円254円2544円347円253円240円/strutsDemo/WebRoot/positive.jsp"
+++ "b/347円254円2544円347円253円240円/strutsDemo/WebRoot/positive.jsp"
@@ -3,10 +3,10 @@
 
 <html>
 <head>
- <title>��ʾ��</title>
+ <title>显示和</title>
 </head>
 
 <body> 
- �������ڵ���0��<h1><s:property value="sum" /></h1>
+ 结果大于等于0,<h1><s:property value="sum" /></h1>
 </body>
- </html> 
\ No newline at end of file
+ </html> 
diff --git "a/347円254円2544円347円253円240円/strutsDemo/src/action/myAction.java" "b/347円254円2544円347円253円240円/strutsDemo/src/action/myAction.java"
index 0e35b0d..9e687c7 100644
--- "a/347円254円2544円347円253円240円/strutsDemo/src/action/myAction.java"
+++ "b/347円254円2544円347円253円240円/strutsDemo/src/action/myAction.java"
@@ -9,12 +9,12 @@ public class myAction extends ActionSupport
 
 public String execute() throws Exception
 {
- 	// �������Ǵ��ڵ���0������positive.jspҳ��
+ 	// 如果和是大于等于0,跳到positive.jsp页面
 	if (getSum()>= 0) 
 {
 return "Positive";
 }
- 	// ������������negative.jspҳ��
+ 	// 如果否则跳到negative.jsp页面
 else 
 {
 return "Negative";
@@ -40,6 +40,6 @@ public void setNum2(int num2) {
 
 	public int getSum()
 {
- return num1 + num2; // �������������Ĵ�������
+ return num1 + num2; // 计算两个整数的代码数和
 }
-}
\ No newline at end of file
+}
diff --git "a/347円254円2544円347円253円240円/strutsValidate/WebRoot/calSum.jsp" "b/347円254円2544円347円253円240円/strutsValidate/WebRoot/calSum.jsp"
index d0202c6..25ff6fe 100644
--- "a/347円254円2544円347円253円240円/strutsValidate/WebRoot/calSum.jsp"
+++ "b/347円254円2544円347円253円240円/strutsValidate/WebRoot/calSum.jsp"
@@ -3,16 +3,16 @@
 
 <html>
 <head>
- <title>����������</title>
+ <title>输入操作数</title>
 </head>
 
 <body>
- ����
+ 求和
 <br/>
 <s:form action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/mystruts/calSum"> 
- <s:textfield name="num1" label="��1"/>
- <s:textfield name="num2" label="��2" /> 
- <s:submit value="����" /> 
+ <s:textfield name="num1" label="数1"/>
+ <s:textfield name="num2" label="数2" /> 
+ <s:submit value="求和" /> 
 </s:form>
 </body>
 </html>
diff --git "a/347円254円2544円347円253円240円/strutsValidate/WebRoot/negative.jsp" "b/347円254円2544円347円253円240円/strutsValidate/WebRoot/negative.jsp"
index 1315e91..20afae2 100644
--- "a/347円254円2544円347円253円240円/strutsValidate/WebRoot/negative.jsp"
+++ "b/347円254円2544円347円253円240円/strutsValidate/WebRoot/negative.jsp"
@@ -3,11 +3,11 @@
 
 <html>
 <head>
- <title>��ʾ��</title>
+ <title>显示和</title>
 </head>
 
 <body>
- ������0��<h1><s:property value="sum" /></h1>
+ 结果小于0,<h1><s:property value="sum" /></h1>
 
 </body>
- </html> 
\ No newline at end of file
+ </html> 
diff --git "a/347円254円2544円347円253円240円/strutsValidate/WebRoot/positive.jsp" "b/347円254円2544円347円253円240円/strutsValidate/WebRoot/positive.jsp"
index fde4184..d01c3af 100644
--- "a/347円254円2544円347円253円240円/strutsValidate/WebRoot/positive.jsp"
+++ "b/347円254円2544円347円253円240円/strutsValidate/WebRoot/positive.jsp"
@@ -3,10 +3,10 @@
 
 <html>
 <head>
- <title>��ʾ��</title>
+ <title>显示和</title>
 </head>
 
 <body> 
- �������ڵ���0��<h1><s:property value="sum" /></h1>
+ 结果大于等于0,<h1><s:property value="sum" /></h1>
 </body>
- </html> 
\ No newline at end of file
+ </html> 
diff --git "a/347円254円2544円347円253円240円/strutsValidate/src/action/myAction.java" "b/347円254円2544円347円253円240円/strutsValidate/src/action/myAction.java"
index dbd6ff5..b2b221a 100644
--- "a/347円254円2544円347円253円240円/strutsValidate/src/action/myAction.java"
+++ "b/347円254円2544円347円253円240円/strutsValidate/src/action/myAction.java"
@@ -12,12 +12,12 @@ public class myAction extends ActionSupport
 
 public String execute() throws Exception
 {
- 	// �������Ǵ��ڵ���0������positive.jspҳ��
+ 	// 如果和是大于等于0,跳到positive.jsp页面
 	if (getSum()>= 0) 
 {
 return "Positive";
 }
- 	// ������������negative.jspҳ��
+ 	// 如果否则跳到negative.jsp页面
 else 
 {
 return "Negative";
@@ -43,7 +43,7 @@ public void setNum2(String num2) {
 
 	public int getSum()
 {
- return n1 + n2; // �������������Ĵ�������
+ return n1 + n2; // 计算两个整数的代码数和
 }
 	
 	
@@ -65,4 +65,4 @@ public void validate()
 		 addFieldError("num2","num2 is not Nunmber.");
 	 }
 }
-}
\ No newline at end of file
+}
diff --git "a/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/WEB-INF/classes/action/registerAction-validation.xml" "b/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/WEB-INF/classes/action/registerAction-validation.xml"
index 0c4efee..a1ed9a7 100644
--- "a/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/WEB-INF/classes/action/registerAction-validation.xml"
+++ "b/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/WEB-INF/classes/action/registerAction-validation.xml"
@@ -41,4 +41,4 @@
 	 		<message>请填写正确的手机号。</message>
 	 	</field-validator>
 	</field>
-</validators>
\ No newline at end of file
+</validators>
diff --git "a/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/register.jsp" "b/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/register.jsp"
index 5c83c34..7465248 100644
--- "a/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/register.jsp"
+++ "b/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/register.jsp"
@@ -4,12 +4,12 @@
 <body>
 <s:fielderror/>
 <form action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/registerAction" validate="true" method="post"> 
- ��1⁄4�û���<input type="text" name="username"><br>
- ��1⁄4���룺<input type="text" name="password"><br>
- ȷ�����룺<input type="text" name="confirm"><br>
- �ʼ���ַ��<input type="text" name="email"><br>
-		 �ֻ����룺<input type="text" name="handphone"><br>
-		 <input type="submit" value="�ύ">
+ 登录用户:<input type="text" name="username"><br>
+ 登录密码:<input type="text" name="password"><br>
+ 确认密码:<input type="text" name="confirm"><br>
+ 邮件地址:<input type="text" name="email"><br>
+		 手机号码:<input type="text" name="handphone"><br>
+		 <input type="submit" value="提交">
 </form>
 </body>
 </html>
diff --git "a/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/registerSuccess.jsp" "b/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/registerSuccess.jsp"
index 86f6aad..5309bf8 100644
--- "a/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/registerSuccess.jsp"
+++ "b/347円254円2544円347円253円240円/strutsValidatewithXML/WebRoot/registerSuccess.jsp"
@@ -5,4 +5,4 @@
 <body>
 <s:property value="username" />
 </body>
- </html> 
\ No newline at end of file
+ </html> 
diff --git "a/347円254円2544円347円253円240円/strutsValidatewithXML/src/action/registerAction-validation.xml" "b/347円254円2544円347円253円240円/strutsValidatewithXML/src/action/registerAction-validation.xml"
index 0c4efee..a1ed9a7 100644
--- "a/347円254円2544円347円253円240円/strutsValidatewithXML/src/action/registerAction-validation.xml"
+++ "b/347円254円2544円347円253円240円/strutsValidatewithXML/src/action/registerAction-validation.xml"
@@ -41,4 +41,4 @@
 	 		<message>请填写正确的手机号。</message>
 	 	</field-validator>
 	</field>
-</validators>
\ No newline at end of file
+</validators>
diff --git "a/347円254円2544円347円253円240円/strutsValidatewithXML/src/action/registerAction.java" "b/347円254円2544円347円253円240円/strutsValidatewithXML/src/action/registerAction.java"
index b47facb..362c7d3 100644
--- "a/347円254円2544円347円253円240円/strutsValidatewithXML/src/action/registerAction.java"
+++ "b/347円254円2544円347円253円240円/strutsValidatewithXML/src/action/registerAction.java"
@@ -66,4 +66,4 @@ public void setMsg(String msg) {
 	}
 
 
-}
\ No newline at end of file
+}
diff --git "a/347円254円2545円347円253円240円/SpringAOPDemo/bin/ApplicationContext.xml" "b/347円254円2545円347円253円240円/SpringAOPDemo/bin/ApplicationContext.xml"
index 3e6922f..98d515a 100644
--- "a/347円254円2545円347円253円240円/SpringAOPDemo/bin/ApplicationContext.xml"
+++ "b/347円254円2545円347円253円240円/SpringAOPDemo/bin/ApplicationContext.xml"
@@ -2,43 +2,43 @@
 <!doctype beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
- 
+ 
 <bean id="accountTarget">
- 
+ 
 <property name="name">
 <value>Java</value>
 </property> 
 </bean>
- 
+ 
 <bean id="myAdvice" />
- 
+ 
 <bean id="myAroundInterceptor" />
-
+
 <bean id="addAdvisor">
- 
+ 
 <property name="advice">
- 
+ 
 <bean />
 </property>
- 
+ 
 <property name="patterns">
 <list>
- 
+ 
 <value>.*add*.</value>
 </list>
 </property>
 </bean>
- 
+ 
 <bean id="account">
- 
+ 
 <property name="proxyInterfaces">
 <value>Account</value>
 </property>
- 
+ 
 <property name="target">
 <ref local="accountTarget"/> 
 </property>
- 
+ 
 <property name="interceptorNames">
 <list>
 <value>addAdvisor</value>
@@ -47,4 +47,4 @@
 </list>
 </property>
 </bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円2545円347円253円240円/SpringAOPDemo/src/Account.java" "b/347円254円2545円347円253円240円/SpringAOPDemo/src/Account.java"
index 37881f4..9943403 100644
--- "a/347円254円2545円347円253円240円/SpringAOPDemo/src/Account.java"
+++ "b/347円254円2545円347円253円240円/SpringAOPDemo/src/Account.java"
@@ -2,4 +2,4 @@ public interface Account
 {
 void add(int money);
 void minus(int money);
-}
\ No newline at end of file
+}
diff --git "a/347円254円2545円347円253円240円/SpringAOPDemo/src/AccountImpl.java" "b/347円254円2545円347円253円240円/SpringAOPDemo/src/AccountImpl.java"
index 7284165..e1c2b18 100644
--- "a/347円254円2545円347円253円240円/SpringAOPDemo/src/AccountImpl.java"
+++ "b/347円254円2545円347円253円240円/SpringAOPDemo/src/AccountImpl.java"
@@ -12,10 +12,10 @@ public void setName(String name) {
 
 	public void add(int money) {
 		
-		System.out.println("��" +name+ "�˻���Ǯ " + money + "Ԫ");
+		System.out.println("给" +name+ "账户加钱 " + money + "元");
 	}
 
 	public void minus(int money) {
-		System.out.println("��"+name+"�˻���Ǯ: " + money + "Ԫ");
+		System.out.println("从"+name+"账户扣钱: " + money + "元");
 	}
-}
\ No newline at end of file
+}
diff --git "a/347円254円2545円347円253円240円/SpringAOPDemo/src/AfterAdvice.java" "b/347円254円2545円347円253円240円/SpringAOPDemo/src/AfterAdvice.java"
index 72409a0..6992dc0 100644
--- "a/347円254円2545円347円253円240円/SpringAOPDemo/src/AfterAdvice.java"
+++ "b/347円254円2545円347円253円240円/SpringAOPDemo/src/AfterAdvice.java"
@@ -6,9 +6,9 @@ public class AfterAdvice implements AfterReturningAdvice
 {
 public void afterReturning(Object returnValue, Method m, Object[] args, Object target)throws Throwable
 {
- 	 System.out.println("�ڷ�������֮��");
- 	 System.out.println("ִ�еķ�����:" + m);
- 	 System.out.println("�����IJ����ǣ�" + args[0]);
- 	 System.out.println("L·�������ǣ�" + target);
+ 	 System.out.println("在方法调用之后");
+ 	 System.out.println("执行的方法是:" + m);
+ 	 System.out.println("方法的参数是:" + args[0]);
+ 	 System.out.println("目标对象是:" + target);
 }
-}
\ No newline at end of file
+}
diff --git "a/347円254円2545円347円253円240円/SpringAOPDemo/src/ApplicationContext.xml" "b/347円254円2545円347円253円240円/SpringAOPDemo/src/ApplicationContext.xml"
index 3e6922f..98d515a 100644
--- "a/347円254円2545円347円253円240円/SpringAOPDemo/src/ApplicationContext.xml"
+++ "b/347円254円2545円347円253円240円/SpringAOPDemo/src/ApplicationContext.xml"
@@ -2,43 +2,43 @@
 <!doctype beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
- 
+ 
 <bean id="accountTarget">
- 
+ 
 <property name="name">
 <value>Java</value>
 </property> 
 </bean>
- 
+ 
 <bean id="myAdvice" />
- 
+ 
 <bean id="myAroundInterceptor" />
-
+
 <bean id="addAdvisor">
- 
+ 
 <property name="advice">
- 
+ 
 <bean />
 </property>
- 
+ 
 <property name="patterns">
 <list>
- 
+ 
 <value>.*add*.</value>
 </list>
 </property>
 </bean>
- 
+ 
 <bean id="account">
- 
+ 
 <property name="proxyInterfaces">
 <value>Account</value>
 </property>
- 
+ 
 <property name="target">
 <ref local="accountTarget"/> 
 </property>
- 
+ 
 <property name="interceptorNames">
 <list>
 <value>addAdvisor</value>
@@ -47,4 +47,4 @@
 </list>
 </property>
 </bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円2545円347円253円240円/SpringAOPDemo/src/AroundInterceptor.java" "b/347円254円2545円347円253円240円/SpringAOPDemo/src/AroundInterceptor.java"
index a2ef46d..7b3a4ab 100644
--- "a/347円254円2545円347円253円240円/SpringAOPDemo/src/AroundInterceptor.java"
+++ "b/347円254円2545円347円253円240円/SpringAOPDemo/src/AroundInterceptor.java"
@@ -6,9 +6,9 @@ public class AroundInterceptor implements MethodInterceptor
 {
 public Object invoke(MethodInvocation invocation) throws Throwable
 {
- System.out.println("���÷���֮ǰ: invocation������[" + invocation + "]");
+ System.out.println("调用方法之前: invocation对象:[" + invocation + "]");
 Object rval = invocation.proceed();
- System.out.println("���ý���...");
+ System.out.println("调用结束...");
 return rval;
 }
-}
\ No newline at end of file
+}
diff --git "a/347円254円2545円347円253円240円/SpringAOPDemo/src/BeforeAdvice.java" "b/347円254円2545円347円253円240円/SpringAOPDemo/src/BeforeAdvice.java"
index 70f539e..e5c32ec 100644
--- "a/347円254円2545円347円253円240円/SpringAOPDemo/src/BeforeAdvice.java"
+++ "b/347円254円2545円347円253円240円/SpringAOPDemo/src/BeforeAdvice.java"
@@ -6,9 +6,9 @@ public class BeforeAdvice implements MethodBeforeAdvice
 {
 public void before(Method m, Object[] args, Object target) throws Throwable
 {
- System.out.println("�ڷ�������֮ǰ");
- System.out.println("ִ�еķ�����:" + m);
- System.out.println("�����IJ����ǣ�" + args[0]);
- System.out.println("L·�������ǣ�" + target);
+ System.out.println("在方法调用之前");
+ System.out.println("执行的方法是:" + m);
+ System.out.println("方法的参数是:" + args[0]);
+ System.out.println("目标对象是:" + target);
 }
-}
\ No newline at end of file
+}
diff --git "a/347円254円2545円347円253円240円/SpringAOPDemo/src/Main.java" "b/347円254円2545円347円253円240円/SpringAOPDemo/src/Main.java"
index ffe84e5..31d6041 100644
--- "a/347円254円2545円347円253円240円/SpringAOPDemo/src/Main.java"
+++ "b/347円254円2545円347円253円240円/SpringAOPDemo/src/Main.java"
@@ -9,9 +9,9 @@ public static void main(String[] args)throws Exception
 ApplicationContext ctx = new FileSystemXmlApplicationContext("src/ApplicationContext.xml");
 Account account = (Account)ctx.getBean("account");
 
- System.out.println("��һ��add����");
+ System.out.println("第一个add方法");
 account.add(100);
- System.out.println("�ڶ���minus����"); 
+ System.out.println("第二个minus方法"); 
 account.minus(100);
 }
 }
diff --git "a/347円254円2545円347円253円240円/SpringIOCAbstractClass/bin/BaseOnInterface/bean.xml" "b/347円254円2545円347円253円240円/SpringIOCAbstractClass/bin/BaseOnInterface/bean.xml"
index e8d697f..5e39b3f 100644
--- "a/347円254円2545円347円253円240円/SpringIOCAbstractClass/bin/BaseOnInterface/bean.xml"
+++ "b/347円254円2545円347円253円240円/SpringIOCAbstractClass/bin/BaseOnInterface/bean.xml"
@@ -7,4 +7,4 @@
 <bean id="hello">
 <lookup-method name="createRandom" bean="ran"/> 
 </bean> 
-</beans> 
\ No newline at end of file
+</beans> 
diff --git "a/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/HelloAbstract.java" "b/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/HelloAbstract.java"
index dd2eb87..817ed40 100644
--- "a/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/HelloAbstract.java"
+++ "b/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/HelloAbstract.java"
@@ -8,4 +8,4 @@ public void setRandom(Random random) {
 }
 
 public abstract Random createRandom();
-} 
\ No newline at end of file
+} 
diff --git "a/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/SpringMain.java" "b/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/SpringMain.java"
index d8ee658..7509726 100644
--- "a/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/SpringMain.java"
+++ "b/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/SpringMain.java"
@@ -18,4 +18,4 @@ public static void main(String[] args) {
 
 }
 
-} 
\ No newline at end of file
+} 
diff --git "a/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/bean.xml" "b/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/bean.xml"
index e8d697f..5e39b3f 100644
--- "a/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/bean.xml"
+++ "b/347円254円2545円347円253円240円/SpringIOCAbstractClass/src/BaseOnInterface/bean.xml"
@@ -7,4 +7,4 @@
 <bean id="hello">
 <lookup-method name="createRandom" bean="ran"/> 
 </bean> 
-</beans> 
\ No newline at end of file
+</beans> 
diff --git "a/347円254円2545円347円253円240円/SpringSingleton/bin/Demo/bean.xml" "b/347円254円2545円347円253円240円/SpringSingleton/bin/Demo/bean.xml"
index 4a17c87..516caeb 100644
--- "a/347円254円2545円347円253円240円/SpringSingleton/bin/Demo/bean.xml"
+++ "b/347円254円2545円347円253円240円/SpringSingleton/bin/Demo/bean.xml"
@@ -3,4 +3,4 @@
 
 <beans>
 <bean id="ran" singleton="false"/> 
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円2545円347円253円240円/SpringSingleton/src/Demo/Main.java" "b/347円254円2545円347円253円240円/SpringSingleton/src/Demo/Main.java"
index dcd9d1c..88979be 100644
--- "a/347円254円2545円347円253円240円/SpringSingleton/src/Demo/Main.java"
+++ "b/347円254円2545円347円253円240円/SpringSingleton/src/Demo/Main.java"
@@ -13,9 +13,9 @@ public static void main(String[] args) {
 
 Random r1 = (Random)ft.getBean("ran");
 Random r2 = (Random)ft.getBean("ran");
- System.out.println("Random������ɻ���Ƿ�ָ��ͬһ�����ã�" + (r1 == r2));
+ System.out.println("Random的两个实例是否指向同一个引用:" + (r1 == r2));
 r1.printRandom();
 r2.printRandom(); 
 }
 
-} 
\ No newline at end of file
+} 
diff --git "a/347円254円2545円347円253円240円/SpringSingleton/src/Demo/Random.java" "b/347円254円2545円347円253円240円/SpringSingleton/src/Demo/Random.java"
index 2487c0d..cbff180 100644
--- "a/347円254円2545円347円253円240円/SpringSingleton/src/Demo/Random.java"
+++ "b/347円254円2545円347円253円240円/SpringSingleton/src/Demo/Random.java"
@@ -4,6 +4,6 @@ public class Random {
 	private int i = (int) (100 * Math.random());
 
 	public void printRandom() {
-		System.out.println("������������: " + i);
+		System.out.println("输出随机整数: " + i);
 	}
 }
diff --git "a/347円254円2545円347円253円240円/SpringSingleton/src/Demo/bean.xml" "b/347円254円2545円347円253円240円/SpringSingleton/src/Demo/bean.xml"
index 4a17c87..516caeb 100644
--- "a/347円254円2545円347円253円240円/SpringSingleton/src/Demo/bean.xml"
+++ "b/347円254円2545円347円253円240円/SpringSingleton/src/Demo/bean.xml"
@@ -3,4 +3,4 @@
 
 <beans>
 <bean id="ran" singleton="false"/> 
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/WEB-INF/spring-servlet.xml" "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/WEB-INF/spring-servlet.xml"
index 4475d21..35874ed 100644
--- "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/WEB-INF/spring-servlet.xml"
+++ "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/WEB-INF/spring-servlet.xml"
@@ -31,4 +31,4 @@ class="Controller.RegisterController">
 </bean> 
 
 
- </beans> 
\ No newline at end of file
+ </beans> 
diff --git "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/WEB-INF/web.xml" "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/WEB-INF/web.xml"
index 5c5271b..4c868df 100644
--- "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/WEB-INF/web.xml"
+++ "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/WEB-INF/web.xml"
@@ -14,4 +14,4 @@
 	 <url-pattern>/</url-pattern> 
 </servlet-mapping> 
 	
-</web-app>
\ No newline at end of file
+</web-app>
diff --git "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/login.jsp" "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/login.jsp"
index 775563c..5a148dd 100644
--- "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/login.jsp"
+++ "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/login.jsp"
@@ -2,9 +2,9 @@
 <html>
 <body> 
 <form action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/loginAction" method="post"> 
- ��1⁄4�û���<input type="text" name="username"><br>
- ��1⁄4���룺<input type="text" name="password"><br> 
-		 <input type="submit" value="�ύ">
+ 登录用户:<input type="text" name="username"><br>
+ 登录密码:<input type="text" name="password"><br> 
+		 <input type="submit" value="提交">
 </form>
 </body>
 </html>
diff --git "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/register.jsp" "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/register.jsp"
index 89bf26d..a73c65f 100644
--- "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/register.jsp"
+++ "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/register.jsp"
@@ -2,9 +2,9 @@
 <html>
 <body> 
 <form action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/registerAction" method="post"> 
- ע���û���<input type="text" name="username"><br>
- ע�����룺<input type="password" name="password"><br> 
-		 <input type="submit" value="����ע��">
+ 注册用户:<input type="text" name="username"><br>
+ 注册密码:<input type="password" name="password"><br> 
+		 <input type="submit" value="完成注册">
 </form>
 </body>
 </html>
diff --git "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/welcome.jsp" "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/welcome.jsp"
index a683ebb..e5fb88b 100644
--- "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/welcome.jsp"
+++ "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/WebRoot/welcome.jsp"
@@ -6,4 +6,4 @@
 <body>
 welcome:<%=request.getattribute("username") %>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/src/Controller/LoginController.java" "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/src/Controller/LoginController.java"
index fdf11af..e0eebdd 100644
--- "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/src/Controller/LoginController.java"
+++ "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/src/Controller/LoginController.java"
@@ -13,7 +13,7 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 	 
 	 String userName=request.getParameter("username");
 
-	 //ʡ��������֤�Ķ���
+	 //省略身份验证的动作
 	 
 	 ModelAndView mav=new ModelAndView("welcome");
 	 mav.addObject("userName",userName);
@@ -26,4 +26,4 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 
 
 
- 
\ No newline at end of file
+ 
diff --git "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/src/Controller/RegisterController.java" "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/src/Controller/RegisterController.java"
index 7d37e30..8998256 100644
--- "a/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/src/Controller/RegisterController.java"
+++ "b/347円254円2546円347円253円240円/SpringBeanNameUrlHandleMappingDemo/src/Controller/RegisterController.java"
@@ -13,7 +13,7 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 	 
 	 String userName=request.getParameter("username");
 
-	 //ʡ��ע���Ķ���
+	 //省略注册的动作
 	 
 	 ModelAndView model=new ModelAndView("welcome");
 	 model.addObject("userName",userName);
@@ -26,4 +26,4 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 
 
 
- 
\ No newline at end of file
+ 
diff --git "a/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/WEB-INF/spring-servlet.xml" "b/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/WEB-INF/spring-servlet.xml"
index 8a89932..505d0fe 100644
--- "a/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/WEB-INF/spring-servlet.xml"
+++ "b/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/WEB-INF/spring-servlet.xml"
@@ -37,4 +37,4 @@
 
 </beans>
 
- 
\ No newline at end of file
+ 
diff --git "a/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/WEB-INF/web.xml" "b/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/WEB-INF/web.xml"
index 5c5271b..4c868df 100644
--- "a/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/WEB-INF/web.xml"
+++ "b/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/WEB-INF/web.xml"
@@ -14,4 +14,4 @@
 	 <url-pattern>/</url-pattern> 
 </servlet-mapping> 
 	
-</web-app>
\ No newline at end of file
+</web-app>
diff --git "a/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/login.jsp" "b/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/login.jsp"
index 775563c..5a148dd 100644
--- "a/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/login.jsp"
+++ "b/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/login.jsp"
@@ -2,9 +2,9 @@
 <html>
 <body> 
 <form action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/loginAction" method="post"> 
- ��1⁄4�û���<input type="text" name="username"><br>
- ��1⁄4���룺<input type="text" name="password"><br> 
-		 <input type="submit" value="�ύ">
+ 登录用户:<input type="text" name="username"><br>
+ 登录密码:<input type="text" name="password"><br> 
+		 <input type="submit" value="提交">
 </form>
 </body>
 </html>
diff --git "a/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/welcome.jsp" "b/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/welcome.jsp"
index a683ebb..e5fb88b 100644
--- "a/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/welcome.jsp"
+++ "b/347円254円2546円347円253円240円/SpringInterceptorDemo/WebRoot/welcome.jsp"
@@ -6,4 +6,4 @@
 <body>
 welcome:<%=request.getattribute("username") %>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/347円254円2546円347円253円240円/SpringInterceptorDemo/src/Controller/LoginController.java" "b/347円254円2546円347円253円240円/SpringInterceptorDemo/src/Controller/LoginController.java"
index fdf11af..e0eebdd 100644
--- "a/347円254円2546円347円253円240円/SpringInterceptorDemo/src/Controller/LoginController.java"
+++ "b/347円254円2546円347円253円240円/SpringInterceptorDemo/src/Controller/LoginController.java"
@@ -13,7 +13,7 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 	 
 	 String userName=request.getParameter("username");
 
-	 //ʡ��������֤�Ķ���
+	 //省略身份验证的动作
 	 
 	 ModelAndView mav=new ModelAndView("welcome");
 	 mav.addObject("userName",userName);
@@ -26,4 +26,4 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 
 
 
- 
\ No newline at end of file
+ 
diff --git "a/347円254円2546円347円253円240円/SpringInterceptorDemo/src/Inteceptor/LoginInterceptor.java" "b/347円254円2546円347円253円240円/SpringInterceptorDemo/src/Inteceptor/LoginInterceptor.java"
index 731f1e7..3b9f3df 100644
--- "a/347円254円2546円347円253円240円/SpringInterceptorDemo/src/Inteceptor/LoginInterceptor.java"
+++ "b/347円254円2546円347円253円240円/SpringInterceptorDemo/src/Inteceptor/LoginInterceptor.java"
@@ -11,7 +11,7 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
 
 @Override
 public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- 	//��ȡurl��ַ 
+ 	//获取url地址 
 String reqUrl=request.getRequestURI(); 
 if(reqUrl.contains("/loginAction")){
 	
@@ -38,4 +38,4 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
 	super.postHandle(request, response, handler, modelAndView);
 }
-}
\ No newline at end of file
+}
diff --git "a/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/WEB-INF/spring-servlet.xml" "b/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/WEB-INF/spring-servlet.xml"
index 20410e0..ab78e14 100644
--- "a/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/WEB-INF/spring-servlet.xml"
+++ "b/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/WEB-INF/spring-servlet.xml"
@@ -21,4 +21,4 @@
 <property name = "suffix" value = ".jsp"></property>
 </bean> 
 
- </beans> 
\ No newline at end of file
+ </beans> 
diff --git "a/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/WEB-INF/web.xml" "b/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/WEB-INF/web.xml"
index ba8f2ed..168ffaa 100644
--- "a/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/WEB-INF/web.xml"
+++ "b/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/WEB-INF/web.xml"
@@ -27,4 +27,4 @@
 	访问 --> 
 	 </servlet-mapping> 
 	
-</web-app>
\ No newline at end of file
+</web-app>
diff --git "a/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/login/hello.jsp" "b/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/login/hello.jsp"
index 3cffc78..31e9b6b 100644
--- "a/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/login/hello.jsp"
+++ "b/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/login/hello.jsp"
@@ -6,4 +6,4 @@
 <body>
 hello:<%=request.getattribute("loginuser") %>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/welcome.jsp" "b/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/welcome.jsp"
index e56c93c..d9a53d5 100644
--- "a/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/welcome.jsp"
+++ "b/347円254円2546円347円253円240円/SpringMVCDemo/WebRoot/welcome.jsp"
@@ -6,4 +6,4 @@
 <body>
 welcome
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/347円254円2546円347円253円240円/SpringMVCDemo/src/com/mvc/rest/RestController.java" "b/347円254円2546円347円253円240円/SpringMVCDemo/src/com/mvc/rest/RestController.java"
index c17751e..bd53a45 100644
--- "a/347円254円2546円347円253円240円/SpringMVCDemo/src/com/mvc/rest/RestController.java"
+++ "b/347円254円2546円347円253円240円/SpringMVCDemo/src/com/mvc/rest/RestController.java"
@@ -28,4 +28,4 @@ public ModelAndView myMethod(HttpServletRequest request, HttpServletResponse res
 public String registPost() { 
 return "/welcome";
 } 
-}
\ No newline at end of file
+}
diff --git "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/WEB-INF/spring-servlet.xml" "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/WEB-INF/spring-servlet.xml"
index f8af765..3d13fe6 100644
--- "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/WEB-INF/spring-servlet.xml"
+++ "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/WEB-INF/spring-servlet.xml"
@@ -39,4 +39,4 @@ class="Controller.RegisterController">
 <property name="order" value="0" />
 </bean> 
 
- </beans> 
\ No newline at end of file
+ </beans> 
diff --git "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/WEB-INF/web.xml" "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/WEB-INF/web.xml"
index 5c5271b..4c868df 100644
--- "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/WEB-INF/web.xml"
+++ "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/WEB-INF/web.xml"
@@ -14,4 +14,4 @@
 	 <url-pattern>/</url-pattern> 
 </servlet-mapping> 
 	
-</web-app>
\ No newline at end of file
+</web-app>
diff --git "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/login.jsp" "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/login.jsp"
index 775563c..5a148dd 100644
--- "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/login.jsp"
+++ "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/login.jsp"
@@ -2,9 +2,9 @@
 <html>
 <body> 
 <form action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/loginAction" method="post"> 
- ��1⁄4�û���<input type="text" name="username"><br>
- ��1⁄4���룺<input type="text" name="password"><br> 
-		 <input type="submit" value="�ύ">
+ 登录用户:<input type="text" name="username"><br>
+ 登录密码:<input type="text" name="password"><br> 
+		 <input type="submit" value="提交">
 </form>
 </body>
 </html>
diff --git "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/register.jsp" "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/register.jsp"
index 89bf26d..a73c65f 100644
--- "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/register.jsp"
+++ "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/register.jsp"
@@ -2,9 +2,9 @@
 <html>
 <body> 
 <form action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/registerAction" method="post"> 
- ע���û���<input type="text" name="username"><br>
- ע�����룺<input type="password" name="password"><br> 
-		 <input type="submit" value="����ע��">
+ 注册用户:<input type="text" name="username"><br>
+ 注册密码:<input type="password" name="password"><br> 
+		 <input type="submit" value="完成注册">
 </form>
 </body>
 </html>
diff --git "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/welcome.jsp" "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/welcome.jsp"
index a683ebb..e5fb88b 100644
--- "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/welcome.jsp"
+++ "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/WebRoot/welcome.jsp"
@@ -6,4 +6,4 @@
 <body>
 welcome:<%=request.getattribute("username") %>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/src/Controller/LoginController.java" "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/src/Controller/LoginController.java"
index fdf11af..e0eebdd 100644
--- "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/src/Controller/LoginController.java"
+++ "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/src/Controller/LoginController.java"
@@ -13,7 +13,7 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 	 
 	 String userName=request.getParameter("username");
 
-	 //ʡ��������֤�Ķ���
+	 //省略身份验证的动作
 	 
 	 ModelAndView mav=new ModelAndView("welcome");
 	 mav.addObject("userName",userName);
@@ -26,4 +26,4 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 
 
 
- 
\ No newline at end of file
+ 
diff --git "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/src/Controller/RegisterController.java" "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/src/Controller/RegisterController.java"
index 7d37e30..8998256 100644
--- "a/347円254円2546円347円253円240円/SpringMutilResolverDemo/src/Controller/RegisterController.java"
+++ "b/347円254円2546円347円253円240円/SpringMutilResolverDemo/src/Controller/RegisterController.java"
@@ -13,7 +13,7 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 	 
 	 String userName=request.getParameter("username");
 
-	 //ʡ��ע���Ķ���
+	 //省略注册的动作
 	 
 	 ModelAndView model=new ModelAndView("welcome");
 	 model.addObject("userName",userName);
@@ -26,4 +26,4 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 
 
 
- 
\ No newline at end of file
+ 
diff --git "a/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/WEB-INF/spring-servlet.xml" "b/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/WEB-INF/spring-servlet.xml"
index ab4a13c..dca1bf4 100644
--- "a/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/WEB-INF/spring-servlet.xml"
+++ "b/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/WEB-INF/spring-servlet.xml"
@@ -24,4 +24,4 @@
 </bean> 
 
 
- </beans> 
\ No newline at end of file
+ </beans> 
diff --git "a/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/WEB-INF/web.xml" "b/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/WEB-INF/web.xml"
index 5c5271b..4c868df 100644
--- "a/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/WEB-INF/web.xml"
+++ "b/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/WEB-INF/web.xml"
@@ -14,4 +14,4 @@
 	 <url-pattern>/</url-pattern> 
 </servlet-mapping> 
 	
-</web-app>
\ No newline at end of file
+</web-app>
diff --git "a/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/login.jsp" "b/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/login.jsp"
index 775563c..5a148dd 100644
--- "a/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/login.jsp"
+++ "b/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/login.jsp"
@@ -2,9 +2,9 @@
 <html>
 <body> 
 <form action="/index.cgi/contrast/https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/compare/loginAction" method="post"> 
- ��1⁄4�û���<input type="text" name="username"><br>
- ��1⁄4���룺<input type="text" name="password"><br> 
-		 <input type="submit" value="�ύ">
+ 登录用户:<input type="text" name="username"><br>
+ 登录密码:<input type="text" name="password"><br> 
+		 <input type="submit" value="提交">
 </form>
 </body>
 </html>
diff --git "a/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/welcome.jsp" "b/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/welcome.jsp"
index a683ebb..e5fb88b 100644
--- "a/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/welcome.jsp"
+++ "b/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/WebRoot/welcome.jsp"
@@ -6,4 +6,4 @@
 <body>
 welcome:<%=request.getattribute("username") %>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/src/Controller/LoginController.java" "b/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/src/Controller/LoginController.java"
index fdf11af..e0eebdd 100644
--- "a/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/src/Controller/LoginController.java"
+++ "b/347円254円2546円347円253円240円/SpringSimpleUrlHandleMappingDemo/src/Controller/LoginController.java"
@@ -13,7 +13,7 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 	 
 	 String userName=request.getParameter("username");
 
-	 //ʡ��������֤�Ķ���
+	 //省略身份验证的动作
 	 
 	 ModelAndView mav=new ModelAndView("welcome");
 	 mav.addObject("userName",userName);
@@ -26,4 +26,4 @@ public ModelAndView handleRequestInternal(HttpServletRequest request,
 
 
 
- 
\ No newline at end of file
+ 
diff --git "a/347円254円2547円347円253円240円/HibernateAnnotationDemo/bin/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateAnnotationDemo/bin/hibernate.cfg.xml"
index 2769dfa..ca77d03 100644
--- "a/347円254円2547円347円253円240円/HibernateAnnotationDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateAnnotationDemo/bin/hibernate.cfg.xml"
@@ -22,4 +22,4 @@
 </property> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateAnnotationDemo/src/com/HibernateMain.java" "b/347円254円2547円347円253円240円/HibernateAnnotationDemo/src/com/HibernateMain.java"
index 86da964..0de21f6 100644
--- "a/347円254円2547円347円253円240円/HibernateAnnotationDemo/src/com/HibernateMain.java"
+++ "b/347円254円2547円347円253円240円/HibernateAnnotationDemo/src/com/HibernateMain.java"
@@ -20,7 +20,7 @@ public static void main(String[] args) {
 SessionFactory sessionFactory = null;
 try{
 registry = new StandardServiceRegistryBuilder().configure("hibernate.cfg.xml").build();
- //��ָ���ļ���Ĭ������hibernate.cfg.xml�ļ�
+ //不指定文件名默认是找hibernate.cfg.xml文件
 //registry = new StandardServiceRegistryBuilder().configure().build(); 
 sessionFactory = new MetadataSources(registry).buildMetadata().buildSessionFactory();
 }catch(Exception ex){
diff --git "a/347円254円2547円347円253円240円/HibernateAnnotationDemo/src/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateAnnotationDemo/src/hibernate.cfg.xml"
index 2769dfa..ca77d03 100644
--- "a/347円254円2547円347円253円240円/HibernateAnnotationDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateAnnotationDemo/src/hibernate.cfg.xml"
@@ -22,4 +22,4 @@
 </property> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateDemo/bin/Model/UserInfo.hbm.xml" "b/347円254円2547円347円253円240円/HibernateDemo/bin/Model/UserInfo.hbm.xml"
index 5473c1f..6374bf0 100644
--- "a/347円254円2547円347円253円240円/HibernateDemo/bin/Model/UserInfo.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateDemo/bin/Model/UserInfo.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="UserInfo" table="UserInfo">
-		<id name="userID" type="int">
-			<column name="UserID" />			
-		</id>
-		<property name="userName" type="java.lang.String">
-			<column name="username" length="20" not-null="true" unique="true" />
-		</property>
-		<property name="pwd" type="java.lang.String">
-			<column name="pwd" length="20"></column>
-		</property>
-		<property name="userType" type="java.lang.String">
-			<column name="usertype" length="20"></column>
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="UserInfo" table="UserInfo">
+		<id name="userID" type="int">
+			<column name="UserID" />			
+		</id>
+		<property name="userName" type="java.lang.String">
+			<column name="username" length="20" not-null="true" unique="true" />
+		</property>
+		<property name="pwd" type="java.lang.String">
+			<column name="pwd" length="20"></column>
+		</property>
+		<property name="userType" type="java.lang.String">
+			<column name="usertype" length="20"></column>
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateDemo/bin/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateDemo/bin/hibernate.cfg.xml"
index e933d0d..3c4497a 100644
--- "a/347円254円2547円347円253円240円/HibernateDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateDemo/bin/hibernate.cfg.xml"
@@ -27,4 +27,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateDemo/src/Model/UserInfo.hbm.xml" "b/347円254円2547円347円253円240円/HibernateDemo/src/Model/UserInfo.hbm.xml"
index 5473c1f..6374bf0 100644
--- "a/347円254円2547円347円253円240円/HibernateDemo/src/Model/UserInfo.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateDemo/src/Model/UserInfo.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="UserInfo" table="UserInfo">
-		<id name="userID" type="int">
-			<column name="UserID" />			
-		</id>
-		<property name="userName" type="java.lang.String">
-			<column name="username" length="20" not-null="true" unique="true" />
-		</property>
-		<property name="pwd" type="java.lang.String">
-			<column name="pwd" length="20"></column>
-		</property>
-		<property name="userType" type="java.lang.String">
-			<column name="usertype" length="20"></column>
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="UserInfo" table="UserInfo">
+		<id name="userID" type="int">
+			<column name="UserID" />			
+		</id>
+		<property name="userName" type="java.lang.String">
+			<column name="username" length="20" not-null="true" unique="true" />
+		</property>
+		<property name="pwd" type="java.lang.String">
+			<column name="pwd" length="20"></column>
+		</property>
+		<property name="userType" type="java.lang.String">
+			<column name="usertype" length="20"></column>
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateDemo/src/com/HibernateMain.java" "b/347円254円2547円347円253円240円/HibernateDemo/src/com/HibernateMain.java"
index 41e9e63..20f0140 100644
--- "a/347円254円2547円347円253円240円/HibernateDemo/src/com/HibernateMain.java"
+++ "b/347円254円2547円347円253円240円/HibernateDemo/src/com/HibernateMain.java"
@@ -19,7 +19,7 @@ public static void main(String[] args) {
 SessionFactory sessionFactory = null;
 try{
 registry = new StandardServiceRegistryBuilder().configure("hibernate.cfg.xml").build();
- //��ָ���ļ���Ĭ������hibernate.cfg.xml�ļ�
+ //不指定文件名默认是找hibernate.cfg.xml文件
 //registry = new StandardServiceRegistryBuilder().configure().build(); 
 sessionFactory = new MetadataSources(registry).buildMetadata().buildSessionFactory();
 }catch(Exception ex){
diff --git "a/347円254円2547円347円253円240円/HibernateDemo/src/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateDemo/src/hibernate.cfg.xml"
index e933d0d..3c4497a 100644
--- "a/347円254円2547円347円253円240円/HibernateDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateDemo/src/hibernate.cfg.xml"
@@ -27,4 +27,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLDemo/bin/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateHQLDemo/bin/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLDemo/bin/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLDemo/bin/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLDemo/bin/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateHQLDemo/bin/hibernate.cfg.xml"
index 50c3b79..b2b0ffe 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLDemo/src/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateHQLDemo/src/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLDemo/src/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLDemo/src/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLDemo/src/com/HibernateMain.java" "b/347円254円2547円347円253円240円/HibernateHQLDemo/src/com/HibernateMain.java"
index 480275f..af80ee8 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLDemo/src/com/HibernateMain.java"
+++ "b/347円254円2547円347円253円240円/HibernateHQLDemo/src/com/HibernateMain.java"
@@ -25,7 +25,7 @@ public static void main(String[] args) {
 
 Session session = sessionFactory.openSession();
 
- //1 ��Object��������ʽ�����ֶ� 
+ //1 以Object数组的形式返回字段 
 List accountList = (List)session.createQuery("select name,bank,balance from Account where balance < :highBalance and balance> :lowBalance").setParameter("highBalance",800.0f).setParameter("lowBalance", 50.0f).list();
 
 for(int i=0;i<accountlist.size();i++) @@ -34,7 +34,7 @@ public static void main(String[] args) { System.out.println(one[0] + "\t" + one[1] + "\t" + one[2]); } - //2 ��group by����ʽ + //2 带group by的形式 List groupbyDemoList = (List)session.createQuery("select name,bank,count(*) from Account group by name,bank having count(*)>1").list();
 
 for(int i=0;i<groupbydemolist.size();i++) diff --git "a/347円254円2547円347円253円240円/HibernateHQLDemo/src/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateHQLDemo/src/hibernate.cfg.xml" index 50c3b79..b2b0ffe 100644 --- "a/347円254円2547円347円253円240円/HibernateHQLDemo/src/hibernate.cfg.xml" +++ "b/347円254円2547円347円253円240円/HibernateHQLDemo/src/hibernate.cfg.xml" @@ -30,4 +30,4 @@ <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/Model/UserInfo.hbm.xml" "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/Model/UserInfo.hbm.xml"
index 5473c1f..6374bf0 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/Model/UserInfo.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/Model/UserInfo.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="UserInfo" table="UserInfo">
-		<id name="userID" type="int">
-			<column name="UserID" />			
-		</id>
-		<property name="userName" type="java.lang.String">
-			<column name="username" length="20" not-null="true" unique="true" />
-		</property>
-		<property name="pwd" type="java.lang.String">
-			<column name="pwd" length="20"></column>
-		</property>
-		<property name="userType" type="java.lang.String">
-			<column name="usertype" length="20"></column>
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="UserInfo" table="UserInfo">
+		<id name="userID" type="int">
+			<column name="UserID" />			
+		</id>
+		<property name="userName" type="java.lang.String">
+			<column name="username" length="20" not-null="true" unique="true" />
+		</property>
+		<property name="pwd" type="java.lang.String">
+			<column name="pwd" length="20"></column>
+		</property>
+		<property name="userType" type="java.lang.String">
+			<column name="usertype" length="20"></column>
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/hibernate.cfg.xml"
index 0d8638c..7d0d992 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/Model/UserInfo.hbm.xml" "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/Model/UserInfo.hbm.xml"
index 5473c1f..6374bf0 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/Model/UserInfo.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/Model/UserInfo.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="UserInfo" table="UserInfo">
-		<id name="userID" type="int">
-			<column name="UserID" />			
-		</id>
-		<property name="userName" type="java.lang.String">
-			<column name="username" length="20" not-null="true" unique="true" />
-		</property>
-		<property name="pwd" type="java.lang.String">
-			<column name="pwd" length="20"></column>
-		</property>
-		<property name="userType" type="java.lang.String">
-			<column name="usertype" length="20"></column>
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="UserInfo" table="UserInfo">
+		<id name="userID" type="int">
+			<column name="UserID" />			
+		</id>
+		<property name="userName" type="java.lang.String">
+			<column name="username" length="20" not-null="true" unique="true" />
+		</property>
+		<property name="pwd" type="java.lang.String">
+			<column name="pwd" length="20"></column>
+		</property>
+		<property name="userType" type="java.lang.String">
+			<column name="usertype" length="20"></column>
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/com/HibernateMain.java" "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/com/HibernateMain.java"
index 84a9d61..090ea51 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/com/HibernateMain.java"
+++ "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/com/HibernateMain.java"
@@ -25,7 +25,7 @@ public static void main(String[] args) {
 
 Session session = sessionFactory.openSession();
 
- //1 ������ѯ 
+ //1 关联查询 
 List list = (List)session.createQuery("select acc.name,acc.bank,acc.balance,u.userType from Account acc, UserInfo u where acc.ID=u.userID").list();
 
 for(int i=0;i<list.size();i++) @@ -34,7 +34,7 @@ public static void main(String[] args) { System.out.println(one[0] + "\t" + one[1] + "\t" + one[2] + "\t" + one[3]); } - //2 �Ӳ�ѯ + //2 子查询 List groupbyDemoList = (List)session.createQuery("select name,bank,balance from Account where ID in (select userID from UserInfo)").list();
 
 for(int i=0;i<groupbydemolist.size();i++) diff --git "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/hibernate.cfg.xml" index 0d8638c..7d0d992 100644 --- "a/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/hibernate.cfg.xml" +++ "b/347円254円2547円347円253円240円/HibernateHQLJoinDemo/src/hibernate.cfg.xml" @@ -30,4 +30,4 @@ <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLSQLDemo/bin/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateHQLSQLDemo/bin/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLSQLDemo/bin/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLSQLDemo/bin/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLSQLDemo/bin/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateHQLSQLDemo/bin/hibernate.cfg.xml"
index 50c3b79..b2b0ffe 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLSQLDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLSQLDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/com/HibernateMain.java" "b/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/com/HibernateMain.java"
index 1af95ea..afc537c 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/com/HibernateMain.java"
+++ "b/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/com/HibernateMain.java"
@@ -28,9 +28,9 @@ public static void main(String[] args) {
 
 Session session = sessionFactory.openSession();
 
- //1 ִ��SQL 
+ //1 执行SQL 
 SQLQuery query = session.createSQLQuery("select id,name,bank,balance from account where ID = ?");
- //���õ�һ��������ֵΪ1,����ѯID=1��account
+ //设置第一个参数的值为1,即查询ID=1的account
 query.setParameter(0, 1);
 List list = query.list();
 
@@ -40,7 +40,7 @@ public static void main(String[] args) {
 	System.out.println(one[0] + "\t" + one[1] + "\t" + one[2] + "\t" + one[3]);
 }
 
- //2 ɻ����ѯ
+ //2 实体查询
 query = session.createSQLQuery("select id,name,bank,balance from account where id = ?").addEntity(Account.class);
 query.setParameter(0, 1);
 List<account> accList = query.list();
@@ -50,7 +50,7 @@ public static void main(String[] args) {
 	System.out.println(one.getID() + "\t" + one.getName() + "\t" + one.getBank() + "\t" + one.getBalance());
 }
 
- //3 ִ�и���
+ //3 执行更新
 query = session.createSQLQuery("update Account set balance = ? where id = ?");
 query.setFloat(0, 2000f);
 query.setInteger(1, 1);
diff --git "a/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/hibernate.cfg.xml"
index 50c3b79..b2b0ffe 100644
--- "a/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateHQLSQLDemo/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernatePKDemo/bin/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernatePKDemo/bin/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernatePKDemo/bin/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernatePKDemo/bin/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernatePKDemo/bin/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernatePKDemo/bin/hibernate.cfg.xml"
index 50c3b79..b2b0ffe 100644
--- "a/347円254円2547円347円253円240円/HibernatePKDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernatePKDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernatePKDemo/src/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernatePKDemo/src/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernatePKDemo/src/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernatePKDemo/src/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernatePKDemo/src/com/HibernateMain.java" "b/347円254円2547円347円253円240円/HibernatePKDemo/src/com/HibernateMain.java"
index ed97715..8d39f6f 100644
--- "a/347円254円2547円347円253円240円/HibernatePKDemo/src/com/HibernateMain.java"
+++ "b/347円254円2547円347円253円240円/HibernatePKDemo/src/com/HibernateMain.java"
@@ -15,7 +15,7 @@ public static void main(String[] args) {
 SessionFactory sessionFactory = null;
 try{
 registry = new StandardServiceRegistryBuilder().configure("hibernate.cfg.xml").build();
- //��ָ���ļ���Ĭ������hibernate.cfg.xml�ļ�
+ //不指定文件名默认是找hibernate.cfg.xml文件
 //registry = new StandardServiceRegistryBuilder().configure().build(); 
 sessionFactory = new MetadataSources(registry).buildMetadata().buildSessionFactory();
 }catch(Exception ex){
diff --git "a/347円254円2547円347円253円240円/HibernatePKDemo/src/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernatePKDemo/src/hibernate.cfg.xml"
index 50c3b79..b2b0ffe 100644
--- "a/347円254円2547円347円253円240円/HibernatePKDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernatePKDemo/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/Model/UserInfo.hbm.xml" "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/Model/UserInfo.hbm.xml"
index 5473c1f..6374bf0 100644
--- "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/Model/UserInfo.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/Model/UserInfo.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="UserInfo" table="UserInfo">
-		<id name="userID" type="int">
-			<column name="UserID" />			
-		</id>
-		<property name="userName" type="java.lang.String">
-			<column name="username" length="20" not-null="true" unique="true" />
-		</property>
-		<property name="pwd" type="java.lang.String">
-			<column name="pwd" length="20"></column>
-		</property>
-		<property name="userType" type="java.lang.String">
-			<column name="usertype" length="20"></column>
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="UserInfo" table="UserInfo">
+		<id name="userID" type="int">
+			<column name="UserID" />			
+		</id>
+		<property name="userName" type="java.lang.String">
+			<column name="username" length="20" not-null="true" unique="true" />
+		</property>
+		<property name="pwd" type="java.lang.String">
+			<column name="pwd" length="20"></column>
+		</property>
+		<property name="userType" type="java.lang.String">
+			<column name="usertype" length="20"></column>
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/hibernate.cfg.xml"
index 0d8638c..7d0d992 100644
--- "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/Model/UserInfo.hbm.xml" "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/Model/UserInfo.hbm.xml"
index 5473c1f..6374bf0 100644
--- "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/Model/UserInfo.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/Model/UserInfo.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="UserInfo" table="UserInfo">
-		<id name="userID" type="int">
-			<column name="UserID" />			
-		</id>
-		<property name="userName" type="java.lang.String">
-			<column name="username" length="20" not-null="true" unique="true" />
-		</property>
-		<property name="pwd" type="java.lang.String">
-			<column name="pwd" length="20"></column>
-		</property>
-		<property name="userType" type="java.lang.String">
-			<column name="usertype" length="20"></column>
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="UserInfo" table="UserInfo">
+		<id name="userID" type="int">
+			<column name="UserID" />			
+		</id>
+		<property name="userName" type="java.lang.String">
+			<column name="username" length="20" not-null="true" unique="true" />
+		</property>
+		<property name="pwd" type="java.lang.String">
+			<column name="pwd" length="20"></column>
+		</property>
+		<property name="userType" type="java.lang.String">
+			<column name="usertype" length="20"></column>
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/com/HibernateMain.java" "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/com/HibernateMain.java"
index fab8893..8755331 100644
--- "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/com/HibernateMain.java"
+++ "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/com/HibernateMain.java"
@@ -33,7 +33,7 @@ public static void main(String[] args) {
 
 Session session = sessionFactory.openSession();
 
- //ͨ��Criteria��������
+ //通过Criteria添加条件
 Criteria crit = session.createCriteria(Account.class);
 crit.add(Restrictions.ge("ID", new Integer(5)));
 crit.add(Restrictions.and( Restrictions.ge("balance", new Float(300f)) ));
@@ -47,7 +47,7 @@ public static void main(String[] args) {
 	System.out.println(one.getID() + "\t" + one.getName() + "\t" + one.getBank() + "\t" + one.getBalance());
 }
 
- //ͨ��group by����
+ //通过group by分组
 List results = session.createCriteria(Account.class)
 		.setProjection( Projections.rowCount() )
 		.list();
diff --git "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/hibernate.cfg.xml"
index 0d8638c..7d0d992 100644
--- "a/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateQueryCrDemo/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateSessionDemo/bin/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateSessionDemo/bin/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateSessionDemo/bin/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateSessionDemo/bin/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateSessionDemo/bin/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateSessionDemo/bin/hibernate.cfg.xml"
index 50c3b79..b2b0ffe 100644
--- "a/347円254円2547円347円253円240円/HibernateSessionDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateSessionDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateSessionDemo/src/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateSessionDemo/src/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateSessionDemo/src/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateSessionDemo/src/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateSessionDemo/src/com/HibernateMain.java" "b/347円254円2547円347円253円240円/HibernateSessionDemo/src/com/HibernateMain.java"
index e4fa460..450c801 100644
--- "a/347円254円2547円347円253円240円/HibernateSessionDemo/src/com/HibernateMain.java"
+++ "b/347円254円2547円347円253円240円/HibernateSessionDemo/src/com/HibernateMain.java"
@@ -29,12 +29,12 @@ public static void main(String[] args) {
 Session session = sessionFactory.openSession();
 Transaction tx = session.beginTransaction();
 
- //1 �õ�Account�������м�1⁄4 
+ //1 得到Account表里所有记录 
 List<account> accountList = new ArrayList<account>();
 		String hqlstr = "from Account";
 		Query query = session.createQuery(hqlstr);
 		accountList = query.list(); 
- //��load��ʽ 
+ //用load方式 
 		System.out.println("load...");
 //		Account loadNotExistAcc = (Account)session.load(Account.class, 100);
 //		if(loadNotExistAcc == null)
@@ -50,7 +50,7 @@ public static void main(String[] args) {
 	Account one = (Account)session.load(Account.class, accountList.get(i).getID());
 	System.out.println(one.getName() + "\t" + one.getBank() + "\t" + one.getBalance());
 }
- //��get��ʽ 
+ //用get方式 
 		System.out.println("get...");
 		Account getNotExistAcc = (Account)session.get(Account.class, 100);
 		if(getNotExistAcc == null)
@@ -88,10 +88,10 @@ public static void main(String[] args) {
 session.save(accForORM);
 tx.commit();
 
- //3 �ٿ�������һ��������������
+ //3 再开启另外一个事务更新数据
 tx = session.beginTransaction();
 accountList = query.list(); 
- //��load��ʽ�õ����ݣ�����ÿ���˻���200Ԫ		
+ //用load方式拿到数据,并给每个账户加200元		
 for(int i = 0;i<accountlist.size();i++) { Account one = (Account)session.load(Account.class, accountList.get(i).getID()); diff --git "a/347円254円2547円347円253円240円/HibernateSessionDemo/src/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateSessionDemo/src/hibernate.cfg.xml" index 50c3b79..b2b0ffe 100644 --- "a/347円254円2547円347円253円240円/HibernateSessionDemo/src/hibernate.cfg.xml" +++ "b/347円254円2547円347円253円240円/HibernateSessionDemo/src/hibernate.cfg.xml" @@ -30,4 +30,4 @@ <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateSessionStatusDemo/bin/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateSessionStatusDemo/bin/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateSessionStatusDemo/bin/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateSessionStatusDemo/bin/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateSessionStatusDemo/bin/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateSessionStatusDemo/bin/hibernate.cfg.xml"
index 50c3b79..b2b0ffe 100644
--- "a/347円254円2547円347円253円240円/HibernateSessionStatusDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateSessionStatusDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/Model/Account.hbm.xml" "b/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/Model/Account.hbm.xml"
index 5a5c081..5845a2d 100644
--- "a/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/Model/Account.hbm.xml"
+++ "b/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/Model/Account.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/com/HibernateMain.java" "b/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/com/HibernateMain.java"
index 62b9235..4cd4971 100644
--- "a/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/com/HibernateMain.java"
+++ "b/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/com/HibernateMain.java"
@@ -27,7 +27,7 @@ public static void main(String[] args) {
 }
 
 Session session = sessionFactory.openSession();
- //��ʾupdate��merge�Լ�saveOrUpdate�IJ���
+ //演示update和merge以及saveOrUpdate的差别
 Transaction tx = session.beginTransaction();
 Account peterAcc = new Account();
 peterAcc.setName("Peter");
@@ -37,17 +37,17 @@ public static void main(String[] args) {
 session.merge(peterAcc); //ok
 session.saveOrUpdate(peterAcc); //ok
 tx.commit();
- //��ʾsave��persist�IJ���
+ //演示save和persist的差别
 tx = session.beginTransaction();
 Account mikeAcc = new Account();
 mikeAcc.setName("Mike");
 mikeAcc.setBank("MikeBank");
 mikeAcc.setBalance(300.0f);
 System.out.println("the new inserted id is:" + session.save(mikeAcc));
- //persist����û�з�������
+ //persist方法没有返回类型
 session.persist(mikeAcc);
 tx.commit(); 
- //��ʾflush���÷�
+ //演示flush的用法
 Account flushAcc = new Account();
 flushAcc.setName("Flush");
 flushAcc.setBank("FlushBank");
@@ -56,7 +56,7 @@ public static void main(String[] args) {
 session.flush();
 flushAcc.setBalance(2000);
 
- //��ʾevict��clear
+ //演示evict和clear
 // Account evictAcc = new Account();
 // evictAcc.setName("Evict");
 // evictAcc.setBank("EvictBank");
@@ -65,7 +65,7 @@ public static void main(String[] args) {
 // //session.evict(evictAcc);// error
 // session.clear();
 // session.flush();
- //�رձ�Ҫ�Ķ���
+ //关闭必要的对象
 session.close();
 		sessionFactory.close(); 
 
diff --git "a/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/hibernate.cfg.xml" "b/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/hibernate.cfg.xml"
index 50c3b79..b2b0ffe 100644
--- "a/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2547円347円253円240円/HibernateSessionStatusDemo/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/Model/Account.hbm.xml" "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/Model/Account.hbm.xml"
index 45b789b..f241017 100644
--- "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/Model/Account.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/Model/Account.hbm.xml"
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-	
- 
- <cache usage="read-only"/>
-	
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+	
+ 
+ <cache usage="read-only"/>
+	
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/ehcache.xml" "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/ehcache.xml"
index cbced70..f54d77c 100644
--- "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/ehcache.xml"
+++ "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/ehcache.xml"
@@ -21,4 +21,4 @@
 timeToLiveSeconds="3600" memoryStoreEvictionPolicy="LFU" />
 
 <diskstore path="d:\\ehcache"/> 
-</ehcache> 
\ No newline at end of file
+</ehcache> 
diff --git "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/hibernate.cfg.xml"
index 7407b3f..fc83fe7 100644
--- "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/bin/hibernate.cfg.xml"
@@ -34,4 +34,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/Model/Account.hbm.xml" "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/Model/Account.hbm.xml"
index 45b789b..f241017 100644
--- "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/Model/Account.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/Model/Account.hbm.xml"
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Account" table="Account">
-	
- 
- <cache usage="read-only"/>
-	
-		<id name="ID" column="ID" type="int">
- <generator />
- </id> 
-		
-		<property name="name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true"/>
-		</property>
-		<property name="bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Account" table="Account">
+	
+ 
+ <cache usage="read-only"/>
+	
+		<id name="ID" column="ID" type="int">
+ <generator />
+ </id> 
+		
+		<property name="name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true"/>
+		</property>
+		<property name="bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/com/HibernateMain.java" "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/com/HibernateMain.java"
index f03cacc..c88be11 100644
--- "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/com/HibernateMain.java"
+++ "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/com/HibernateMain.java"
@@ -38,13 +38,13 @@ public static void main(String[] args) {
 Session session = sessionFactory.openSession();
 
 Transaction tr1 = session.beginTransaction(); 
- //����IDΪ1�Ķ��� 
+ //加载ID为1的对象 
 Account acc1 = (Account) session.get(Account.class, 1); 
 System.out.println("In First Session, name is "+ acc1.getName()); 
 tr1.commit(); 
 session.close(); 
 
- //����IDͬ����1�Ķ��� 
+ //加载ID同样是1的对象 
 Session session2 = sessionFactory.openSession(); 
 Transaction tr2 = session2.beginTransaction(); 
 Account acc2 = (Account) session2.get(Account.class, 1); 
diff --git "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/ehcache.xml" "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/ehcache.xml"
index cbced70..f54d77c 100644
--- "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/ehcache.xml"
+++ "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/ehcache.xml"
@@ -21,4 +21,4 @@
 timeToLiveSeconds="3600" memoryStoreEvictionPolicy="LFU" />
 
 <diskstore path="d:\\ehcache"/> 
-</ehcache> 
\ No newline at end of file
+</ehcache> 
diff --git "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/hibernate.cfg.xml"
index 7407b3f..fc83fe7 100644
--- "a/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HIbernateSeniorCacheDemo/src/hibernate.cfg.xml"
@@ -34,4 +34,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSenior1to1AnnoDemo/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSenior1to1AnnoDemo/bin/hibernate.cfg.xml"
index ec9f1b8..24873a2 100644
--- "a/347円254円2548円347円253円240円/HibernateSenior1to1AnnoDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenior1to1AnnoDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map">
 <ul class="image_map"> 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSenior1to1AnnoDemo/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSenior1to1AnnoDemo/src/hibernate.cfg.xml"
index ec9f1b8..24873a2 100644
--- "a/347円254円2548円347円253円240円/HibernateSenior1to1AnnoDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenior1to1AnnoDemo/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map">
 <ul class="image_map"> 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/Model/Card.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/Model/Card.hbm.xml"
index 2f8d1c7..30dd01e 100644
--- "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/Model/Card.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/Model/Card.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Card" table="Card">
-		<id name="CardID" column="CardID" type="java.lang.String">
- 
- </id> 
-		
-		<property name="PersonID" type="java.lang.String">
-			<column name="PersonID" length="20" not-null="true"/>
-		</property>
-		<property name="Bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="Balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Card" table="Card">
+		<id name="CardID" column="CardID" type="java.lang.String">
+ 
+ </id> 
+		
+		<property name="PersonID" type="java.lang.String">
+			<column name="PersonID" length="20" not-null="true"/>
+		</property>
+		<property name="Bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="Balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/Model/Person.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/Model/Person.hbm.xml"
index 36ee7c3..75df903 100644
--- "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/Model/Person.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/Model/Person.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Person" table="Person">
-		<id name="ID" type="java.lang.String">	
-		 					
-		</id>
-		<property name="Name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true" />
-		</property>
-		<property name="Phone" type="java.lang.String">
-			<column name="Phone" length="20"></column>
-		</property>		
-		
-		<one-to-one name="Card" cascade="all"></one-to-one>
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Person" table="Person">
+		<id name="ID" type="java.lang.String">	
+		 					
+		</id>
+		<property name="Name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true" />
+		</property>
+		<property name="Phone" type="java.lang.String">
+			<column name="Phone" length="20"></column>
+		</property>		
+		
+		<one-to-one name="Card" cascade="all"></one-to-one>
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/hibernate.cfg.xml"
index ed7a859..7fa0ac7 100644
--- "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Card.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Card.hbm.xml"
index 2f8d1c7..30dd01e 100644
--- "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Card.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Card.hbm.xml"
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Card" table="Card">
-		<id name="CardID" column="CardID" type="java.lang.String">
- 
- </id> 
-		
-		<property name="PersonID" type="java.lang.String">
-			<column name="PersonID" length="20" not-null="true"/>
-		</property>
-		<property name="Bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="Balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Card" table="Card">
+		<id name="CardID" column="CardID" type="java.lang.String">
+ 
+ </id> 
+		
+		<property name="PersonID" type="java.lang.String">
+			<column name="PersonID" length="20" not-null="true"/>
+		</property>
+		<property name="Bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="Balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Person.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Person.hbm.xml"
index 36ee7c3..75df903 100644
--- "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Person.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Person.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Person" table="Person">
-		<id name="ID" type="java.lang.String">	
-		 					
-		</id>
-		<property name="Name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true" />
-		</property>
-		<property name="Phone" type="java.lang.String">
-			<column name="Phone" length="20"></column>
-		</property>		
-		
-		<one-to-one name="Card" cascade="all"></one-to-one>
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Person" table="Person">
+		<id name="ID" type="java.lang.String">	
+		 					
+		</id>
+		<property name="Name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true" />
+		</property>
+		<property name="Phone" type="java.lang.String">
+			<column name="Phone" length="20"></column>
+		</property>		
+		
+		<one-to-one name="Card" cascade="all"></one-to-one>
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Person.java" "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Person.java"
index 5b0c63d..8cc2189 100644
--- "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Person.java"
+++ "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/Model/Person.java"
@@ -5,7 +5,7 @@ public class Person {
 private String ID;
 private String Name;
 private String Phone;
- //����һ��һ�Ĺ�ε������ӳ������ɻ��������
+ //体现一对一的关系。保存映射类的实例对象。
 private Card card;
 
 	public String getID() {
diff --git "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/hibernate.cfg.xml"
index ed7a859..7fa0ac7 100644
--- "a/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenior1to1Demo/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorEventDemo/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSeniorEventDemo/bin/hibernate.cfg.xml"
index 57f0d4b..88bf2cd 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorEventDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorEventDemo/bin/hibernate.cfg.xml"
@@ -33,4 +33,4 @@
 <listener type="post-delete"/>
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorEventDemo/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSeniorEventDemo/src/hibernate.cfg.xml"
index 57f0d4b..88bf2cd 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorEventDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorEventDemo/src/hibernate.cfg.xml"
@@ -33,4 +33,4 @@
 <listener type="post-delete"/>
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorEventDemo/src/listener/UserInfoListener.java" "b/347円254円2548円347円253円240円/HibernateSeniorEventDemo/src/listener/UserInfoListener.java"
index bf66b05..0922a8e 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorEventDemo/src/listener/UserInfoListener.java"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorEventDemo/src/listener/UserInfoListener.java"
@@ -40,11 +40,11 @@ public void onPostUpdate(PostUpdateEvent event) {
 	 }
 		
 		for (int i = 0; i < event.getState().length; i++) { - // ����ǰ��ֵ + // 更新前的值 Object oldValue = event.getOldState()[i]; - // ���o�����ֵ + // 更新后的新值 Object newValue = event.getState()[i]; - //���μ������� + //更新的属性名 String propertyName = event.getPersister().getPropertyNames()[i]; System.out.println("property" + propertyName + "change from " +oldValue + " to " + newValue); } @@ -61,12 +61,12 @@ public void onPostDelete(PostDeleteEvent event) { System.out.println("after delete"); System.out.println(event.getEntity().getClass().getName()); for (int i = 0; i < event.getDeletedState().length; i++) { - // ����ǰ��ֵ + // 更新前的值 Object deletedValue = event.getDeletedState()[i]; - //���μ������� + //更新的属性名 String propertyName = event.getPersister().getPropertyNames()[i]; System.out.println("property" + propertyName + " value " + deletedValue); } } -} \ No newline at end of file +} diff --git "a/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/bin/hibernate.cfg.xml" index e6fc60a..dc224b3 100644 --- "a/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/bin/hibernate.cfg.xml" +++ "b/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/bin/hibernate.cfg.xml" @@ -28,4 +28,4 @@ <ul class="image_map">
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/src/hibernate.cfg.xml"
index e6fc60a..dc224b3 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/src/hibernate.cfg.xml"
@@ -28,4 +28,4 @@
 <ul class="image_map">
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/src/interceptor/UserInfoInterceptor.java" "b/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/src/interceptor/UserInfoInterceptor.java"
index 72f29d8..bc91a35 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/src/interceptor/UserInfoInterceptor.java"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorInceptorDemo/src/interceptor/UserInfoInterceptor.java"
@@ -35,7 +35,7 @@ public boolean onSave(Object entity,Serializable id, Object[] state,String[] pro
 {
 for (int index=0;index<propertynames.length;index++) { - /*�ҵ���Ϊ"userName"������*/ + /*找到名为"userName"的属性*/ if ("userType".equals(propertyNames[index])) { if(state[index].toString().equals("Vip")) @@ -58,4 +58,4 @@ public void onDelete(Object entity,Serializable id, Object[] state,String[] prop } -} \ No newline at end of file +} diff --git "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/Model/Card.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/Model/Card.hbm.xml" index dbbc985..118908e 100644 --- "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/Model/Card.hbm.xml" +++ "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/Model/Card.hbm.xml" @@ -1,20 +1,20 @@ -<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Card" table="Card">
-		<id name="CardID" column="CardID" type="java.lang.String">
- 
- </id> 
-		<property name="PersonID" type="java.lang.String">
-			<column name="PersonID" length="20" not-null="true"/>
-		</property>
-		<property name="Bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="Balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Card" table="Card">
+		<id name="CardID" column="CardID" type="java.lang.String">
+ 
+ </id> 
+		<property name="PersonID" type="java.lang.String">
+			<column name="PersonID" length="20" not-null="true"/>
+		</property>
+		<property name="Bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="Balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/Model/Person.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/Model/Person.hbm.xml"
index 0943521..ac2e889 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/Model/Person.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/Model/Person.hbm.xml"
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Person" table="Person">
-		<id name="ID" type="java.lang.String">	
-		 					
-		</id>
-		<property name="Name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true" />
-		</property>
-		<property name="Phone" type="java.lang.String">
-			<column name="Phone" length="20"></column>
-		</property>		
-		
-	 <ul class="image_map"> 
- 
- 
- <index column="cardID" type="string"></index> 
- 
- <one-to-many /> 
- </ul> 
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Person" table="Person">
+		<id name="ID" type="java.lang.String">	
+		 					
+		</id>
+		<property name="Name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true" />
+		</property>
+		<property name="Phone" type="java.lang.String">
+			<column name="Phone" length="20"></column>
+		</property>		
+		
+	 <ul class="image_map"> 
+ 
+ 
+ <index column="cardID" type="string"></index> 
+ 
+ <one-to-many /> 
+ </ul> 
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/hibernate.cfg.xml"
index ed7a859..7fa0ac7 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/Model/Card.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/Model/Card.hbm.xml"
index dbbc985..118908e 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/Model/Card.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/Model/Card.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Card" table="Card">
-		<id name="CardID" column="CardID" type="java.lang.String">
- 
- </id> 
-		<property name="PersonID" type="java.lang.String">
-			<column name="PersonID" length="20" not-null="true"/>
-		</property>
-		<property name="Bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="Balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Card" table="Card">
+		<id name="CardID" column="CardID" type="java.lang.String">
+ 
+ </id> 
+		<property name="PersonID" type="java.lang.String">
+			<column name="PersonID" length="20" not-null="true"/>
+		</property>
+		<property name="Bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="Balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/Model/Person.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/Model/Person.hbm.xml"
index 0943521..ac2e889 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/Model/Person.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/Model/Person.hbm.xml"
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Person" table="Person">
-		<id name="ID" type="java.lang.String">	
-		 					
-		</id>
-		<property name="Name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true" />
-		</property>
-		<property name="Phone" type="java.lang.String">
-			<column name="Phone" length="20"></column>
-		</property>		
-		
-	 <ul class="image_map"> 
- 
- 
- <index column="cardID" type="string"></index> 
- 
- <one-to-many /> 
- </ul> 
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Person" table="Person">
+		<id name="ID" type="java.lang.String">	
+		 					
+		</id>
+		<property name="Name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true" />
+		</property>
+		<property name="Phone" type="java.lang.String">
+			<column name="Phone" length="20"></column>
+		</property>		
+		
+	 <ul class="image_map"> 
+ 
+ 
+ <index column="cardID" type="string"></index> 
+ 
+ <one-to-many /> 
+ </ul> 
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/hibernate.cfg.xml"
index ed7a859..7fa0ac7 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorMapDemo/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/bin/hibernate.cfg.xml"
index ec9f1b8..24873a2 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/bin/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map">
 <ul class="image_map"> 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/src/com/HibernateMain.java" "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/src/com/HibernateMain.java"
index 9e08f47..d4fdf1e 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/src/com/HibernateMain.java"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/src/com/HibernateMain.java"
@@ -22,7 +22,7 @@ public static void main(String[] args) {
 SessionFactory sessionFactory = null;
 try{
 registry = new StandardServiceRegistryBuilder().configure("hibernate.cfg.xml").build();
- //��ָ���ļ���Ĭ������hibernate.cfg.xml�ļ�
+ //不指定文件名默认是找hibernate.cfg.xml文件
 //registry = new StandardServiceRegistryBuilder().configure().build(); 
 sessionFactory = new MetadataSources(registry).buildMetadata().buildSessionFactory();
 }catch(Exception ex){
@@ -62,11 +62,11 @@ public static void main(String[] args) {
 	Person onePerson = (Person)session.load(Person.class, "Person123");
 Set<card> cardSet = onePerson.getCards() ;
 	
- //ʡ��System.out.println��ӡ����
+ //省略System.out.println打印语句
 
 Card oneCard = (Card)session.load(Card.class, "Card123");
 Person cardOwner = oneCard.getPerson();
- //ʡ��System.out.println��ӡ����
+ //省略System.out.println打印语句
 
 // 	session.delete(onePerson);
 // 	session.flush();
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/src/hibernate.cfg.xml"
index ec9f1b8..24873a2 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreAnno/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map">
 <ul class="image_map"> 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/Model/Card.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/Model/Card.hbm.xml"
index dbbc985..118908e 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/Model/Card.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/Model/Card.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Card" table="Card">
-		<id name="CardID" column="CardID" type="java.lang.String">
- 
- </id> 
-		<property name="PersonID" type="java.lang.String">
-			<column name="PersonID" length="20" not-null="true"/>
-		</property>
-		<property name="Bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="Balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Card" table="Card">
+		<id name="CardID" column="CardID" type="java.lang.String">
+ 
+ </id> 
+		<property name="PersonID" type="java.lang.String">
+			<column name="PersonID" length="20" not-null="true"/>
+		</property>
+		<property name="Bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="Balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/Model/Person.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/Model/Person.hbm.xml"
index effaf76..319fae4 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/Model/Person.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/Model/Person.hbm.xml"
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Person" table="Person">
-		<id name="ID" type="java.lang.String">	
-		 					
-		</id>
-		<property name="Name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true" />
-		</property>
-		<property name="Phone" type="java.lang.String">
-			<column name="Phone" length="20"></column>
-		</property>		
-		
-	 <list name="cardList" table="Person" cascade="all"> 
- <key column="PersonID" /> 
- <list-index column="cardIndex"/>
- <one-to-many /> 
- </list> 
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Person" table="Person">
+		<id name="ID" type="java.lang.String">	
+		 					
+		</id>
+		<property name="Name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true" />
+		</property>
+		<property name="Phone" type="java.lang.String">
+			<column name="Phone" length="20"></column>
+		</property>		
+		
+	 <list name="cardList" table="Person" cascade="all"> 
+ <key column="PersonID" /> 
+ <list-index column="cardIndex"/>
+ <one-to-many /> 
+ </list> 
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/hibernate.cfg.xml"
index ed7a859..7fa0ac7 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Card.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Card.hbm.xml"
index dbbc985..118908e 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Card.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Card.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Card" table="Card">
-		<id name="CardID" column="CardID" type="java.lang.String">
- 
- </id> 
-		<property name="PersonID" type="java.lang.String">
-			<column name="PersonID" length="20" not-null="true"/>
-		</property>
-		<property name="Bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="Balance" type="float">
-			
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Card" table="Card">
+		<id name="CardID" column="CardID" type="java.lang.String">
+ 
+ </id> 
+		<property name="PersonID" type="java.lang.String">
+			<column name="PersonID" length="20" not-null="true"/>
+		</property>
+		<property name="Bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="Balance" type="float">
+			
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Person.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Person.hbm.xml"
index effaf76..319fae4 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Person.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Person.hbm.xml"
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Person" table="Person">
-		<id name="ID" type="java.lang.String">	
-		 					
-		</id>
-		<property name="Name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true" />
-		</property>
-		<property name="Phone" type="java.lang.String">
-			<column name="Phone" length="20"></column>
-		</property>		
-		
-	 <list name="cardList" table="Person" cascade="all"> 
- <key column="PersonID" /> 
- <list-index column="cardIndex"/>
- <one-to-many /> 
- </list> 
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Person" table="Person">
+		<id name="ID" type="java.lang.String">	
+		 					
+		</id>
+		<property name="Name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true" />
+		</property>
+		<property name="Phone" type="java.lang.String">
+			<column name="Phone" length="20"></column>
+		</property>		
+		
+	 <list name="cardList" table="Person" cascade="all"> 
+ <key column="PersonID" /> 
+ <list-index column="cardIndex"/>
+ <one-to-many /> 
+ </list> 
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Person.java" "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Person.java"
index 384e68b..380906f 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Person.java"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/Model/Person.java"
@@ -7,7 +7,7 @@ public class Person {
 private String ID;
 private String Name;
 private String Phone;
- //ͨ��List��ɻ��һ�Զ�
+ //通过List来实现一对多
 private List<card> cardList;
 
 	public String getID() {
diff --git "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/hibernate.cfg.xml"
index ed7a859..7fa0ac7 100644
--- "a/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSeniorOne2MoreDemo/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/Model/Card.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/Model/Card.hbm.xml"
index 58f3413..6dd12e8 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/Model/Card.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/Model/Card.hbm.xml"
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Card" table="Card">
-		<id name="CardID" column="CardID" type="java.lang.String">
- 
- </id> 
-		<property name="PersonID" type="java.lang.String">
-			<column name="PersonID" length="20" not-null="true"/>
-		</property>
-		<property name="Bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="Balance" type="float">
-			
-		</property>
-		
- 	 <many-to-one name="Person" cascade="save-update">
- 	 </many-to-one>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Card" table="Card">
+		<id name="CardID" column="CardID" type="java.lang.String">
+ 
+ </id> 
+		<property name="PersonID" type="java.lang.String">
+			<column name="PersonID" length="20" not-null="true"/>
+		</property>
+		<property name="Bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="Balance" type="float">
+			
+		</property>
+		
+ 	 <many-to-one name="Person" cascade="save-update">
+ 	 </many-to-one>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/Model/Person.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/Model/Person.hbm.xml"
index 7b0cd56..62c309c 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/Model/Person.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/Model/Person.hbm.xml"
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Person" table="Person">
-		<id name="ID" type="java.lang.String">	
-		 					
-		</id>
-		<property name="Name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true" />
-		</property>
-		<property name="Phone" type="java.lang.String">
-			<column name="Phone" length="20"></column>
-		</property>		
-		
-		<set name="cards" cascade="save-update" inverse="false"> 
- <key column="PersonID"/> 
- <one-to-many /> 
- </set> 
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Person" table="Person">
+		<id name="ID" type="java.lang.String">	
+		 					
+		</id>
+		<property name="Name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true" />
+		</property>
+		<property name="Phone" type="java.lang.String">
+			<column name="Phone" length="20"></column>
+		</property>		
+		
+		<set name="cards" cascade="save-update" inverse="false"> 
+ <key column="PersonID"/> 
+ <one-to-many /> 
+ </set> 
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/hibernate.cfg.xml"
index ed7a859..7fa0ac7 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/Model/Card.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/Model/Card.hbm.xml"
index 58f3413..6dd12e8 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/Model/Card.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/Model/Card.hbm.xml"
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Card" table="Card">
-		<id name="CardID" column="CardID" type="java.lang.String">
- 
- </id> 
-		<property name="PersonID" type="java.lang.String">
-			<column name="PersonID" length="20" not-null="true"/>
-		</property>
-		<property name="Bank" type="java.lang.String">
-			<column name="Bank" length="20"></column>
-		</property>
-		<property name="Balance" type="float">
-			
-		</property>
-		
- 	 <many-to-one name="Person" cascade="save-update">
- 	 </many-to-one>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Card" table="Card">
+		<id name="CardID" column="CardID" type="java.lang.String">
+ 
+ </id> 
+		<property name="PersonID" type="java.lang.String">
+			<column name="PersonID" length="20" not-null="true"/>
+		</property>
+		<property name="Bank" type="java.lang.String">
+			<column name="Bank" length="20"></column>
+		</property>
+		<property name="Balance" type="float">
+			
+		</property>
+		
+ 	 <many-to-one name="Person" cascade="save-update">
+ 	 </many-to-one>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/Model/Person.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/Model/Person.hbm.xml"
index 7b0cd56..62c309c 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/Model/Person.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/Model/Person.hbm.xml"
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Person" table="Person">
-		<id name="ID" type="java.lang.String">	
-		 					
-		</id>
-		<property name="Name" type="java.lang.String">
-			<column name="Name" length="20" not-null="true" />
-		</property>
-		<property name="Phone" type="java.lang.String">
-			<column name="Phone" length="20"></column>
-		</property>		
-		
-		<set name="cards" cascade="save-update" inverse="false"> 
- <key column="PersonID"/> 
- <one-to-many /> 
- </set> 
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Person" table="Person">
+		<id name="ID" type="java.lang.String">	
+		 					
+		</id>
+		<property name="Name" type="java.lang.String">
+			<column name="Name" length="20" not-null="true" />
+		</property>
+		<property name="Phone" type="java.lang.String">
+			<column name="Phone" length="20"></column>
+		</property>		
+		
+		<set name="cards" cascade="save-update" inverse="false"> 
+ <key column="PersonID"/> 
+ <one-to-many /> 
+ </set> 
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/hibernate.cfg.xml"
index ed7a859..7fa0ac7 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorInverseDemo/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorM2MAnnoDemo/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSenorM2MAnnoDemo/bin/hibernate.cfg.xml"
index 24b1e5e..78411c6 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorM2MAnnoDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorM2MAnnoDemo/bin/hibernate.cfg.xml"
@@ -31,4 +31,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorM2MAnnoDemo/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSenorM2MAnnoDemo/src/hibernate.cfg.xml"
index 24b1e5e..78411c6 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorM2MAnnoDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorM2MAnnoDemo/src/hibernate.cfg.xml"
@@ -31,4 +31,4 @@
 <ul class="image_map"> 
 
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/Model/Course.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/Model/Course.hbm.xml"
index 0eb1182..9df4962 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/Model/Course.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/Model/Course.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Course" table="Course">
-		<id name="courseID" column="CourseID" type="java.lang.String">
- 
- </id> 
-		<property name="courseName" type="java.lang.String">
-			<column name="CourseName" length="20" not-null="true"/>
-		</property>
-		
-		 <set name="students" table="students_courses" cascade="save-update"> 
- 
- 
- </set> 
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Course" table="Course">
+		<id name="courseID" column="CourseID" type="java.lang.String">
+ 
+ </id> 
+		<property name="courseName" type="java.lang.String">
+			<column name="CourseName" length="20" not-null="true"/>
+		</property>
+		
+		 <set name="students" table="students_courses" cascade="save-update"> 
+ 
+ 
+ </set> 
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/Model/Student.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/Model/Student.hbm.xml"
index 141ecff..663f7d6 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/Model/Student.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/Model/Student.hbm.xml"
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Student" table="Student">
-		<id name="studentID" column="StudentID" type="java.lang.String">		 					
-		</id>
-		<property name="studentName" type="java.lang.String">
-			<column name="Name" length="20" not-null="true" />
-		</property>
-		
-	 <set name="courses" table="students_courses" cascade="save-update"> 
- 
- 
- </set> 
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Student" table="Student">
+		<id name="studentID" column="StudentID" type="java.lang.String">		 					
+		</id>
+		<property name="studentName" type="java.lang.String">
+			<column name="Name" length="20" not-null="true" />
+		</property>
+		
+	 <set name="courses" table="students_courses" cascade="save-update"> 
+ 
+ 
+ </set> 
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/hibernate.cfg.xml"
index bf566b3..404deb7 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/bin/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/Model/Course.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/Model/Course.hbm.xml"
index 0eb1182..9df4962 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/Model/Course.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/Model/Course.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Course" table="Course">
-		<id name="courseID" column="CourseID" type="java.lang.String">
- 
- </id> 
-		<property name="courseName" type="java.lang.String">
-			<column name="CourseName" length="20" not-null="true"/>
-		</property>
-		
-		 <set name="students" table="students_courses" cascade="save-update"> 
- 
- 
- </set> 
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Course" table="Course">
+		<id name="courseID" column="CourseID" type="java.lang.String">
+ 
+ </id> 
+		<property name="courseName" type="java.lang.String">
+			<column name="CourseName" length="20" not-null="true"/>
+		</property>
+		
+		 <set name="students" table="students_courses" cascade="save-update"> 
+ 
+ 
+ </set> 
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/Model/Student.hbm.xml" "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/Model/Student.hbm.xml"
index 141ecff..663f7d6 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/Model/Student.hbm.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/Model/Student.hbm.xml"
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="Student" table="Student">
-		<id name="studentID" column="StudentID" type="java.lang.String">		 					
-		</id>
-		<property name="studentName" type="java.lang.String">
-			<column name="Name" length="20" not-null="true" />
-		</property>
-		
-	 <set name="courses" table="students_courses" cascade="save-update"> 
- 
- 
- </set> 
-		
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="Student" table="Student">
+		<id name="studentID" column="StudentID" type="java.lang.String">		 					
+		</id>
+		<property name="studentName" type="java.lang.String">
+			<column name="Name" length="20" not-null="true" />
+		</property>
+		
+	 <set name="courses" table="students_courses" cascade="save-update"> 
+ 
+ 
+ </set> 
+		
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/hibernate.cfg.xml" "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/hibernate.cfg.xml"
index bf566b3..404deb7 100644
--- "a/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/hibernate.cfg.xml"
+++ "b/347円254円2548円347円253円240円/HibernateSenorM2MDemo/src/hibernate.cfg.xml"
@@ -30,4 +30,4 @@
 <ul class="image_map"> 
 <ul class="image_map">
 </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
diff --git "a/347円254円2549円347円253円240円/HibernateSpringDemo/bin/ApplicationContext.xml" "b/347円254円2549円347円253円240円/HibernateSpringDemo/bin/ApplicationContext.xml"
index c665e28..f1a7771 100644
--- "a/347円254円2549円347円253円240円/HibernateSpringDemo/bin/ApplicationContext.xml"
+++ "b/347円254円2549円347円253円240円/HibernateSpringDemo/bin/ApplicationContext.xml"
@@ -30,4 +30,4 @@
 
 </bean> 
 
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円2549円347円253円240円/HibernateSpringDemo/src/ApplicationContext.xml" "b/347円254円2549円347円253円240円/HibernateSpringDemo/src/ApplicationContext.xml"
index c665e28..f1a7771 100644
--- "a/347円254円2549円347円253円240円/HibernateSpringDemo/src/ApplicationContext.xml"
+++ "b/347円254円2549円347円253円240円/HibernateSpringDemo/src/ApplicationContext.xml"
@@ -30,4 +30,4 @@
 
 </bean> 
 
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円2549円347円253円240円/HibernateSpringXmlDemo/bin/ApplicationContext.xml" "b/347円254円2549円347円253円240円/HibernateSpringXmlDemo/bin/ApplicationContext.xml"
index 765aaa4..893a735 100644
--- "a/347円254円2549円347円253円240円/HibernateSpringXmlDemo/bin/ApplicationContext.xml"
+++ "b/347円254円2549円347円253円240円/HibernateSpringXmlDemo/bin/ApplicationContext.xml"
@@ -39,4 +39,4 @@
 value="Model/*.hbm.xml"></property> 
 </bean> 
 
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円2549円347円253円240円/HibernateSpringXmlDemo/bin/Model/UserInfo.hbm.xml" "b/347円254円2549円347円253円240円/HibernateSpringXmlDemo/bin/Model/UserInfo.hbm.xml"
index 5473c1f..6374bf0 100644
--- "a/347円254円2549円347円253円240円/HibernateSpringXmlDemo/bin/Model/UserInfo.hbm.xml"
+++ "b/347円254円2549円347円253円240円/HibernateSpringXmlDemo/bin/Model/UserInfo.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="UserInfo" table="UserInfo">
-		<id name="userID" type="int">
-			<column name="UserID" />			
-		</id>
-		<property name="userName" type="java.lang.String">
-			<column name="username" length="20" not-null="true" unique="true" />
-		</property>
-		<property name="pwd" type="java.lang.String">
-			<column name="pwd" length="20"></column>
-		</property>
-		<property name="userType" type="java.lang.String">
-			<column name="usertype" length="20"></column>
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="UserInfo" table="UserInfo">
+		<id name="userID" type="int">
+			<column name="UserID" />			
+		</id>
+		<property name="userName" type="java.lang.String">
+			<column name="username" length="20" not-null="true" unique="true" />
+		</property>
+		<property name="pwd" type="java.lang.String">
+			<column name="pwd" length="20"></column>
+		</property>
+		<property name="userType" type="java.lang.String">
+			<column name="usertype" length="20"></column>
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2549円347円253円240円/HibernateSpringXmlDemo/src/ApplicationContext.xml" "b/347円254円2549円347円253円240円/HibernateSpringXmlDemo/src/ApplicationContext.xml"
index 765aaa4..893a735 100644
--- "a/347円254円2549円347円253円240円/HibernateSpringXmlDemo/src/ApplicationContext.xml"
+++ "b/347円254円2549円347円253円240円/HibernateSpringXmlDemo/src/ApplicationContext.xml"
@@ -39,4 +39,4 @@
 value="Model/*.hbm.xml"></property> 
 </bean> 
 
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円2549円347円253円240円/HibernateSpringXmlDemo/src/Model/UserInfo.hbm.xml" "b/347円254円2549円347円253円240円/HibernateSpringXmlDemo/src/Model/UserInfo.hbm.xml"
index 5473c1f..6374bf0 100644
--- "a/347円254円2549円347円253円240円/HibernateSpringXmlDemo/src/Model/UserInfo.hbm.xml"
+++ "b/347円254円2549円347円253円240円/HibernateSpringXmlDemo/src/Model/UserInfo.hbm.xml"
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!doctype hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="Model">
-	<class name="UserInfo" table="UserInfo">
-		<id name="userID" type="int">
-			<column name="UserID" />			
-		</id>
-		<property name="userName" type="java.lang.String">
-			<column name="username" length="20" not-null="true" unique="true" />
-		</property>
-		<property name="pwd" type="java.lang.String">
-			<column name="pwd" length="20"></column>
-		</property>
-		<property name="userType" type="java.lang.String">
-			<column name="usertype" length="20"></column>
-		</property>
-	</class>	
-</hibernate-mapping>
\ No newline at end of file
+<?xml version="1.0"?>
+<!doctype hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="Model">
+	<class name="UserInfo" table="UserInfo">
+		<id name="userID" type="int">
+			<column name="UserID" />			
+		</id>
+		<property name="userName" type="java.lang.String">
+			<column name="username" length="20" not-null="true" unique="true" />
+		</property>
+		<property name="pwd" type="java.lang.String">
+			<column name="pwd" length="20"></column>
+		</property>
+		<property name="userType" type="java.lang.String">
+			<column name="usertype" length="20"></column>
+		</property>
+	</class>	
+</hibernate-mapping>
diff --git "a/347円254円2549円347円253円240円/HibernateTransByProgram/bin/ApplicationContext.xml" "b/347円254円2549円347円253円240円/HibernateTransByProgram/bin/ApplicationContext.xml"
index 200f8d9..8f9acd2 100644
--- "a/347円254円2549円347円253円240円/HibernateTransByProgram/bin/ApplicationContext.xml"
+++ "b/347円254円2549円347円253円240円/HibernateTransByProgram/bin/ApplicationContext.xml"
@@ -43,4 +43,4 @@
 </bean> 
 
 
-</beans>
\ No newline at end of file
+</beans>
diff --git "a/347円254円2549円347円253円240円/HibernateTransByProgram/src/ApplicationContext.xml" "b/347円254円2549円347円253円240円/HibernateTransByProgram/src/ApplicationContext.xml"
index 200f8d9..8f9acd2 100644
--- "a/347円254円2549円347円253円240円/HibernateTransByProgram/src/ApplicationContext.xml"
+++ "b/347円254円2549円347円253円240円/HibernateTransByProgram/src/ApplicationContext.xml"
@@ -43,4 +43,4 @@
 </bean> 
 
 
-</beans>
\ No newline at end of file
+</beans>
From 09575dc8a7a373055ff46576e9ce7009ebe3c066 Mon Sep 17 00:00:00 2001
From: yansheng836 <sheng.yan836@gmail.com>
Date: 2019年12月31日 23:51:24 +0800
Subject: [PATCH 2/2] docs(README.md): add description for encoding
---
 README.md &#124; 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index db55c49..9182d08 100644
--- a/README.md
+++ b/README.md
@@ -39,4 +39,24 @@ git clone https://github.com/yansheng836/java-web-lightweight-development-interv
 
 ## 说明
 
-原博文视点下载的压缩包含有大量的jar,很占空间,因此统一将其整理到[`lib`](./lib/)目录下。
+### 1.jar
+
+原博文视点下载的代码没有使用项目构建工具进行管理(如Maven等),含有大量的jar,很占空间,因此统一将其整理到[`lib`](./lib/)目录下。
+
+### 2.编码
+
+原代码文件编码不一,有gbk、utf8等,即master分支代码。于是进行了转换,转换后:
+
+utf8-->[utf分支](https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/tree/utf8)
+
+gbk-->[gbk分支](https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial/tree/gbk)
+
+#### 克隆
+
+```bash
+# utf8分支
+git clone -b utf8 https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial.git
+
+# gbk分支
+git clone -b gbk https://github.com/yansheng836/java-web-lightweight-development-interview-tutorial.git
+```