diff --git a/.myeclipse/profiler/jsh_java_erp on MyEclipse Tomcat.xml b/.myeclipse/profiler/jsh_java_erp on MyEclipse Tomcat.xml
index 1911783a..1946fce0 100644
--- a/.myeclipse/profiler/jsh_java_erp on MyEclipse Tomcat.xml	
+++ b/.myeclipse/profiler/jsh_java_erp on MyEclipse Tomcat.xml	
@@ -29,7 +29,7 @@ com.jsh.model.vo.basic.**
 com.jsh.service.asset.**
 com.jsh.service.basic.**
 com.jsh.servlet.**
-com.jsh.util.common.**
+com.jsh.util.**
 </entry>
 <entry key="ProfilerCPUSettings_filter_value">com.jsh.action.asset.*,&#13;
 com.jsh.action.basic.*,&#13;
@@ -50,7 +50,7 @@ com.jsh.model.vo.basic.*,&#13;
 com.jsh.service.asset.*,&#13;
 com.jsh.service.basic.*,&#13;
 com.jsh.servlet.*,&#13;
-com.jsh.util.common.*</entry>
+com.jsh.util.*</entry>
 <entry key="profiler.settings.istrument.getter.setter.methods">true</entry>
 <entry key="myeclipse.profiling.mode">0</entry>
 <entry key="ProfilerMemorySettings_stacktraces">-1</entry>
diff --git a/config/hibernate/hibernate.cfg.xml b/config/hibernate/hibernate.cfg.xml
index f81441d0..366b9e51 100644
--- a/config/hibernate/hibernate.cfg.xml
+++ b/config/hibernate/hibernate.cfg.xml
@@ -1,45 +1,47 @@
-<!DOCTYPE hibernate-configuration PUBLIC
-	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-<session-factory>
-	<!--
-		<property name="hibernate.connection.driver_class">
-		com.mysql.jdbc.Driver
-		</property>
-		<property name="hibernate.connection.url">
-		jdbc:mysql:///myshop
-		</property>
-		<property name="hibernate.connection.username">root</property>
-		<property name="connection.password">root</property>
-	-->
-	<property name="hibernate.dialect">
-		org.hibernate.dialect.MySQL5Dialect
-	</property>
-	<property name="show_sql">true</property>
-	<!-- 一般重新建库用create(慎用)，只更新字段用update -->
-	<property name="hbm2ddl.auto">update</property>
-
-	<!-- 对应的实体映射 -->
-	<mapping resource="com/jsh/model/po/Supplier.hbm.xml" />
-	<mapping resource="com/jsh/model/po/Logdetails.hbm.xml" />
-	<mapping resource="com/jsh/model/po/Assetname.hbm.xml" />
-	<mapping resource="com/jsh/model/po/Category.hbm.xml" />
-	<mapping resource="com/jsh/model/po/Basicuser.hbm.xml" />
-	<mapping resource="com/jsh/model/po/Asset.hbm.xml" />
-	<mapping resource="com/jsh/model/po/Depot.hbm.xml" />
-	<mapping resource="com/jsh/model/po/App.hbm.xml" />
-	<mapping resource="com/jsh/model/po/Role.hbm.xml" />
-	<mapping resource="com/jsh/model/po/Functions.hbm.xml" />
-	<mapping resource="com/jsh/model/po/UserBusiness.hbm.xml" />
-	<mapping resource="com/jsh/model/po/Person.hbm.xml" />
-	<mapping resource="com/jsh/model/po/MaterialCategory.hbm.xml" />
-	<mapping resource="com/jsh/model/po/Material.hbm.xml" />
-    <mapping resource="com/jsh/model/po/Building.hbm.xml" />
-    <mapping resource="com/jsh/model/po/DepotHead.hbm.xml" />
-    <mapping resource="com/jsh/model/po/DepotItem.hbm.xml" />
-    <mapping resource="com/jsh/model/po/Account.hbm.xml" />
-    <mapping resource="com/jsh/model/po/InOutItem.hbm.xml" />
-</session-factory>
-</hibernate-configuration>
+<!DOCTYPE hibernate-configuration PUBLIC
+	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+	"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+<session-factory>
+	<!--
+		<property name="hibernate.connection.driver_class">
+		com.mysql.jdbc.Driver
+		</property>
+		<property name="hibernate.connection.url">
+		jdbc:mysql:///myshop
+		</property>
+		<property name="hibernate.connection.username">root</property>
+		<property name="connection.password">root</property>
+	-->
+	<property name="hibernate.dialect">
+		org.hibernate.dialect.MySQL5Dialect
+	</property>
+	<property name="show_sql">true</property>
+	<!-- 一般重新建库用create(慎用)，只更新字段用update -->
+	<property name="hbm2ddl.auto">update</property>
+
+	<!-- 对应的实体映射 -->
+	<mapping resource="com/jsh/model/po/Supplier.hbm.xml" />
+	<mapping resource="com/jsh/model/po/Logdetails.hbm.xml" />
+	<mapping resource="com/jsh/model/po/Assetname.hbm.xml" />
+	<mapping resource="com/jsh/model/po/Category.hbm.xml" />
+	<mapping resource="com/jsh/model/po/Basicuser.hbm.xml" />
+	<mapping resource="com/jsh/model/po/Asset.hbm.xml" />
+	<mapping resource="com/jsh/model/po/Depot.hbm.xml" />
+	<mapping resource="com/jsh/model/po/App.hbm.xml" />
+	<mapping resource="com/jsh/model/po/Role.hbm.xml" />
+	<mapping resource="com/jsh/model/po/Functions.hbm.xml" />
+	<mapping resource="com/jsh/model/po/UserBusiness.hbm.xml" />
+	<mapping resource="com/jsh/model/po/Person.hbm.xml" />
+	<mapping resource="com/jsh/model/po/MaterialCategory.hbm.xml" />
+	<mapping resource="com/jsh/model/po/Material.hbm.xml" />
+    <mapping resource="com/jsh/model/po/Building.hbm.xml" />
+    <mapping resource="com/jsh/model/po/DepotHead.hbm.xml" />
+    <mapping resource="com/jsh/model/po/DepotItem.hbm.xml" />
+    <mapping resource="com/jsh/model/po/Account.hbm.xml" />
+    <mapping resource="com/jsh/model/po/InOutItem.hbm.xml" />
+    <mapping resource="com/jsh/model/po/AccountHead.hbm.xml" />
+    <mapping resource="com/jsh/model/po/AccountItem.hbm.xml" />
+</session-factory>
+</hibernate-configuration>
diff --git a/config/log4j/log4j.properties b/config/log4j/log4j.properties
index 56469870..46226f16 100644
--- a/config/log4j/log4j.properties
+++ b/config/log4j/log4j.properties
@@ -1,67 +1,67 @@
-# level : 是日志记录的优先级，分为OFF、FATAL、ERROR、WARN、INFO、DEBUG、ALL或者您定义的级别。
-#Log4j建议只使用四个级别，优先级从高到低分别是ERROR、WARN、INFO、DEBUG。
-#Log4jTest.java中的Logger logger = Logger.getLogger(this.getClass().getName());可能对应了log4j.rootLogger=DEBUG,CONSOLE,A1的配置
-log4j.rootLogger=INFO,D,E,stdout
-
-##########控制台输出##############
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-#log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%p]-[%C %M %L]:%m%n
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n
-
-#######配置hibernate日志输入目录,暂时没有使用到############
-#log4j.logger.org.hibernate = OFF,hibernate
-#log4j.logger.org.hibernate.tool.hbm2ddl=debug
-#log4j.appender.hibernate = org.apache.log4j.RollingFileAppender
-#log4j.appender.hibernate.file = ${webApp.log4j.path}/logs/ams_hibernate.log
-#log4j.appender.hibernate.layout = org.apache.log4j.PatternLayout
-#log4j.appender.hibernate.layout.conversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%p]-[%C %M %L]:%m%n
-#log4j.appender.hibernate.layout.conversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n
-#log4j.appender.hibernate.append = false
-
-###输出到日志文件指定最低为INFO级别 ###
-log4j.appender.D=org.apache.log4j.RollingFileAppender
-log4j.appender.D.File=${webApp.log4j.path}/logs/jsh-info.log
-log4j.appender.D.MaxFileSize=50MB
-log4j.appender.D.MaxBackupIndex=10
-##the lower level
-log4j.appender.D.Threshold=INFO 
-log4j.appender.D.layout=org.apache.log4j.PatternLayout
-#log4j.appender.D.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [%p]-[%C %M %L]:%m%n
-log4j.appender.D.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n
-
-###输出错误信息内容到指定文件ERROR级别###
-log4j.appender.E= org.apache.log4j.RollingFileAppender
-log4j.appender.E.File=${webApp.log4j.path}/logs/jsh-error.log
-log4j.appender.E.MaxFileSize=50MB
-log4j.appender.E.MaxBackupIndex=10 
-log4j.appender.E.Threshold = ERROR 
-log4j.appender.E.layout = org.apache.log4j.PatternLayout
-##log4j.appender.E.layout.ConversionPattern =%-d{yyyy-MM-dd HH\:mm\:ss} [%p]-[%C %M %L]\:%m%n 
-log4j.appender.E.layout.ConversionPattern =%-d{yyyy-MM-dd HH\:mm\:ss} [%p]-%m%n
-#  %n代表换行
-#  %d代表日期
-#  %c代表路径名（Logger.getLogger("DAO")时为DAO:，Logger.getLogger(this.getClass().getName())时为绝对类名）#  %c{1}为类名，如Log4jTest
-#  %l代表类路径及代码所在行数，%L仅代表代码所在行数
-#  [%-5p]代表该日志对应的日志级别（%5p），如DEBUG,ERROR，中间的-起到在[]中左对齐的作用
-#  %m代表“类名:”（Logger.getLogger("DAO")时为DAO:，Logger.getLogger(this.getClass().getName())时为类名）及日志信息
-#----------------------------------------------------------------------------------
-#分别说明如下：
-#1、使用Logger logger = Logger.getLogger("DAO")获得配置时，属性文件中必须要有对应设置：log4j.logger.DAO=DEBUG,A2
-#2、%c为DAO
-#3、%l为logger.debug("DAO: Debug info.");的类绝对路径以及代码所在行，
-#   log.DAOlogTest.doGet(DAOlogTest.java:23)
-#4、%L为logger.debug("DAO: Debug info.");代码所在行 23
-#5、%m为类名和日志信息     DAO: Debug info.
-#1、使用Logger logger = Logger.getLogger(this.getClass().getName())获得配置时
-#2、%c为log.Log4jTest    %c{1}为Log4jTest
-#3、%l为 log.Log4jTest.doGet(Log4jTest.java:23)
-#4、%L同上
-#5、%m为 Debug info.
-#－X号: X信息输出时左对齐；
-#%p: 日志信息级别
-#%d{}: 日志信息产生时间
-#%c: 日志信息所在地（类名）
-#%m: 产生的日志具体信息
-#%n: 输出日志信息换行
\ No newline at end of file
+# level : 是日志记录的优先级，分为OFF、FATAL、ERROR、WARN、INFO、DEBUG、ALL或者您定义的级别。
+#Log4j建议只使用四个级别，优先级从高到低分别是ERROR、WARN、INFO、DEBUG。
+#Log4jTest.java中的Logger logger = Logger.getLogger(this.getClass().getName());可能对应了log4j.rootLogger=DEBUG,CONSOLE,A1的配置
+log4j.rootLogger=INFO,D,E,stdout
+
+##########控制台输出##############
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+#log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%p]-[%C %M %L]:%m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n
+
+#######配置hibernate日志输入目录,暂时没有使用到############
+#log4j.logger.org.hibernate = OFF,hibernate
+#log4j.logger.org.hibernate.tool.hbm2ddl=debug
+#log4j.appender.hibernate = org.apache.log4j.RollingFileAppender
+#log4j.appender.hibernate.file = ${webApp.log4j.path}/logs/jsh_hibernate.log
+#log4j.appender.hibernate.layout = org.apache.log4j.PatternLayout
+#log4j.appender.hibernate.layout.conversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%p]-[%C %M %L]:%m%n
+#log4j.appender.hibernate.layout.conversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n
+#log4j.appender.hibernate.append = false
+
+###输出到日志文件指定最低为INFO级别 ###
+log4j.appender.D=org.apache.log4j.RollingFileAppender
+log4j.appender.D.File=${webApp.log4j.path}/logs/jsh-info.log
+log4j.appender.D.MaxFileSize=50MB
+log4j.appender.D.MaxBackupIndex=10
+##the lower level
+log4j.appender.D.Threshold=INFO 
+log4j.appender.D.layout=org.apache.log4j.PatternLayout
+#log4j.appender.D.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [%p]-[%C %M %L]:%m%n
+log4j.appender.D.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n
+
+###输出错误信息内容到指定文件ERROR级别###
+log4j.appender.E= org.apache.log4j.RollingFileAppender
+log4j.appender.E.File=${webApp.log4j.path}/logs/jsh-error.log
+log4j.appender.E.MaxFileSize=50MB
+log4j.appender.E.MaxBackupIndex=10 
+log4j.appender.E.Threshold = ERROR 
+log4j.appender.E.layout = org.apache.log4j.PatternLayout
+##log4j.appender.E.layout.ConversionPattern =%-d{yyyy-MM-dd HH\:mm\:ss} [%p]-[%C %M %L]\:%m%n 
+log4j.appender.E.layout.ConversionPattern =%-d{yyyy-MM-dd HH\:mm\:ss} [%p]-%m%n
+#  %n代表换行
+#  %d代表日期
+#  %c代表路径名（Logger.getLogger("DAO")时为DAO:，Logger.getLogger(this.getClass().getName())时为绝对类名）#  %c{1}为类名，如Log4jTest
+#  %l代表类路径及代码所在行数，%L仅代表代码所在行数
+#  [%-5p]代表该日志对应的日志级别（%5p），如DEBUG,ERROR，中间的-起到在[]中左对齐的作用
+#  %m代表“类名:”（Logger.getLogger("DAO")时为DAO:，Logger.getLogger(this.getClass().getName())时为类名）及日志信息
+#----------------------------------------------------------------------------------
+#分别说明如下：
+#1、使用Logger logger = Logger.getLogger("DAO")获得配置时，属性文件中必须要有对应设置：log4j.logger.DAO=DEBUG,A2
+#2、%c为DAO
+#3、%l为logger.debug("DAO: Debug info.");的类绝对路径以及代码所在行，
+#   log.DAOlogTest.doGet(DAOlogTest.java:23)
+#4、%L为logger.debug("DAO: Debug info.");代码所在行 23
+#5、%m为类名和日志信息     DAO: Debug info.
+#1、使用Logger logger = Logger.getLogger(this.getClass().getName())获得配置时
+#2、%c为log.Log4jTest    %c{1}为Log4jTest
+#3、%l为 log.Log4jTest.doGet(Log4jTest.java:23)
+#4、%L同上
+#5、%m为 Debug info.
+#－X号: X信息输出时左对齐；
+#%p: 日志信息级别
+#%d{}: 日志信息产生时间
+#%c: 日志信息所在地（类名）
+#%m: 产生的日志具体信息
+#%n: 输出日志信息换行
diff --git a/config/spring/basic-applicationContext.xml b/config/spring/basic-applicationContext.xml
index cfe6e2f1..2f391ae5 100644
--- a/config/spring/basic-applicationContext.xml
+++ b/config/spring/basic-applicationContext.xml
@@ -1,336 +1,360 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 指定Spring配置文件的Schema信息 -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-	http://www.springframework.org/schema/tx 
-	http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-	http://www.springframework.org/schema/aop 
-	http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-	<!-- 装载属性配置文件 -->
-	<bean id="propertyConfig"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="locations" value="classpath:common/jdbc.properties">
-	</property>
-	</bean>
-	<!-- 配置数据源C3P0 -->
-	<bean id="dataSource"
-		class="com.mchange.v2.c3p0.ComboPooledDataSource"
-		destroy-method="close">
-		
-		<property name="jdbcUrl" value="${jdbcUrl}"></property>
-		<property name="driverClass" value="${driverClass}"></property>
-		<property name="user" value="${user}"></property>
-		<property name="password" value="${password}"></property>
-
-		<!--初始化时获取的连接数，取值应在minPoolSize与maxPoolSize之间。Default: 3 -->
-		<property name="initialPoolSize" value="10"/>
-		<!--连接池中保留的最大连接数。Default: 15 -->
-		<property name="maxPoolSize" value="80"/>
-		<!--连接池中保留的最小连接数。-->
-		<property name="minPoolSize" value="3"/>
-		<!--最大空闲时间,60秒内未使用则连接被丢弃。若为0则永不丢弃。Default: 0 -->
-		<property name="maxIdleTime" value="60" />
-		<property name="maxStatements" value="6000"/>
-		<!--当连接池中的连接耗尽的时候c3p0一次同时获取的连接数。Default: 3 -->
-		<property name="acquireIncrement" value="10"/>
-		<!--每60秒检查所有连接池中的空闲连接。Default: 0 -->
-		<property name="idleConnectionTestPeriod" value="60" />
-	</bean>
-	<!-- 配置SessionFactory -->
-	<bean id="sessionFactory"
-		class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource" ref="dataSource"/>
-		<property name="configLocation" value="classpath:hibernate/hibernate.cfg.xml"/>
-	</bean>
-
-	<!-- 配置Hibernate的局部事务管理器，使用HibernateTransactionManager类 -->
-	<!-- 该类实现PlatformTransactionManager接口，是针对Hibernate的特定实现-->
-	<bean id="transactionManager" 
-		class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-		<!-- 配置HibernateTransactionManager时需要依注入SessionFactory的引用 -->
-		<property name="sessionFactory" ref="sessionFactory"/>
-	</bean>
-	
-	<!-- 配置事务切面Bean,指定事务管理器 -->
-	<tx:advice id="txAdvice" transaction-manager="transactionManager">
-		<!-- 用于配置详细的事务语义 -->
-		<tx:attributes>
-			<!-- 所有以'get'开头的方法是read-only的 -->
-			<tx:method name="get*" read-only="true"/>
-			<!-- 其他方法使用默认的事务设置 -->
-			<tx:method name="*"/>
-		</tx:attributes>
-	</tx:advice>
-	
-	<!-- 配置daoTemplate，作为所有DAO组件的模板 -->
-	<bean id="serviceTemplate" abstract="true">
-		<!-- 为DAO组件注入SessionFactory引用 -->
-		<property name="baseDao" ref="baseDao"/>
-	</bean>
-	
-	<!--通用baseservice配置开始 -->
-	<!-- <bean id="baseService"  class="com.jsh.base.BaseService" abstract="true">
-	为DAO组件注入SessionFactory引用
-		<property name="baseDao" ref="baseDao"/>
-	</bean> -->
-	
-	<!--用户配置开始 -->
-	<bean id="userService" class="com.jsh.service.basic.UserService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="userDao" ref="userDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="userAction" class="com.jsh.action.basic.UserAction" scope="prototype">
-		<property name="userService" ref="userService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--用户配置结束 -->
-	
-	<!--日志配置开始 -->
-	<bean id="logService" class="com.jsh.service.basic.LogService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="logDao" ref="logDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="logAction" class="com.jsh.action.basic.LogAction" scope="prototype">
-		<property name="logService" ref="logService"/>
-		<property name="userService" ref="userService"/>
-	</bean>
-	<!--日志配置结束 -->
-	
-	<!--供应商配置开始 -->
-	<bean id="supplierService" class="com.jsh.service.basic.SupplierService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="supplierDao" ref="supplierDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="supplierAction" class="com.jsh.action.basic.SupplierAction" scope="prototype">
-		<property name="supplierService" ref="supplierService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--供应商配置结束 -->
-	
-	<!--分类配置开始 -->
-	<bean id="categoryService" class="com.jsh.service.basic.CategoryService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="categoryDao" ref="categoryDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="categoryAction" class="com.jsh.action.basic.CategoryAction" scope="prototype">
-		<property name="categoryService" ref="categoryService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--分类配置结束 -->
-	
-	
-	<!--仓库配置开始 -->
-	<bean id="depotService" class="com.jsh.service.basic.DepotService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="depotDao" ref="depotDao"/>
-		<property name="userBusinessDao" ref="userBusinessDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="depotAction" class="com.jsh.action.basic.DepotAction" scope="prototype">
-		<property name="depotService" ref="depotService"/>
-		<property name="userBusinessService" ref="userBusinessService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--仓库配置结束 -->
-	
-	<!--应用配置开始 -->
-	<bean id="appService" class="com.jsh.service.basic.AppService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="appDao" ref="appDao"/>
-		<property name="userBusinessDao" ref="userBusinessDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="appAction" class="com.jsh.action.basic.AppAction" scope="prototype">
-		<property name="appService" ref="appService"/>
-		<property name="userBusinessService" ref="userBusinessService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--应用配置结束 -->
-	
-	<!--角色配置开始 -->
-	<bean id="roleService" class="com.jsh.service.basic.RoleService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="roleDao" ref="roleDao"/>
-		<property name="userBusinessDao" ref="userBusinessDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="roleAction" class="com.jsh.action.basic.RoleAction" scope="prototype">
-		<property name="roleService" ref="roleService"/>
-		<property name="userBusinessService" ref="userBusinessService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--角色配置结束 -->
-	
-	<!--功能配置开始 -->
-	<bean id="functionsService" class="com.jsh.service.basic.FunctionsService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="functionsDao" ref="functionsDao"/>	
-		<property name="userBusinessDao" ref="userBusinessDao"/>		
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="functionsAction" class="com.jsh.action.basic.FunctionsAction" scope="prototype">
-		<property name="functionsService" ref="functionsService"/>
-		<property name="userBusinessService" ref="userBusinessService"/>		
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--功能配置结束 -->
-	
-	<!--用户对应关系配置开始 -->
-	<bean id="userBusinessService" class="com.jsh.service.basic.UserBusinessService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="userBusinessDao" ref="userBusinessDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="userBusinessAction" class="com.jsh.action.basic.UserBusinessAction" scope="prototype">
-		<property name="userBusinessService" ref="userBusinessService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--用户对应关系配置结束 -->
-	
-	<!--资产名称配置开始 -->
-	<bean id="assetnameService" class="com.jsh.service.basic.AssetNameService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="assetNameDao" ref="assetNameDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="assetNameAction" class="com.jsh.action.basic.AssetNameAction" scope="prototype">
-		<property name="assetnameService" ref="assetnameService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--资产名称配置结束 -->
-	
-	<!--资产配置开始 -->
-	<bean id="assetService" class="com.jsh.service.asset.AssetService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="assetDao" ref="assetDao"/>
-		<property name="assetNameDao" ref="assetNameDao"/>
-		<property name="categoryDao" ref="categoryDao"/>
-		<property name="supplierDao" ref="supplierDao"/>
-		<property name="userDao" ref="userDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="assetAction" class="com.jsh.action.asset.AssetAction" scope="prototype">
-		<property name="assetService" ref="assetService"/>
-		<property name="categoryService" ref="categoryService"/>
-		<property name="supplierService" ref="supplierService"/>
-		<property name="userService" ref="userService"/>
-		<property name="assetnameService" ref="assetnameService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--资产配置结束 -->
-	
-	<!-- 资产报表配置开始 -->
-	<bean id="reportService" class="com.jsh.service.asset.ReportService">
-		<property name="reportDao" ref="reportDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="reportAction" class="com.jsh.action.asset.ReportAction" scope="prototype">
-		<property name="reportService" ref="reportService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--资产报表配置结束 -->
-	
-	<!--经手人配置开始 -->
-	<bean id="personService" class="com.jsh.service.materials.PersonService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="personDao" ref="personDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="personAction" class="com.jsh.action.materials.PersonAction" scope="prototype">
-		<property name="personService" ref="personService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--经手人配置结束 -->
-	
-	<!--商品类别配置开始 -->
-	<bean id="materialCategoryService" class="com.jsh.service.materials.MaterialCategoryService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="materialCategoryDao" ref="materialCategoryDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="materialCategoryAction" class="com.jsh.action.materials.MaterialCategoryAction" scope="prototype">
-		<property name="materialCategoryService" ref="materialCategoryService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--商品类别配置结束 -->
-	
-	<!--商品配置开始 -->
-	<bean id="materialService" class="com.jsh.service.materials.MaterialService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="materialDao" ref="materialDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="materialAction" class="com.jsh.action.materials.MaterialAction" scope="prototype">
-		<property name="materialService" ref="materialService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--商品配置结束 -->
-	
-	<!--单元配置开始 -->
-	<bean id="buildingService" class="com.jsh.service.materials.BuildingService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="buildingDao" ref="buildingDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="buildingAction" class="com.jsh.action.materials.BuildingAction" scope="prototype">
-		<property name="buildingService" ref="buildingService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--单元配置结束 -->
-	
-	<!--仓管通配置开始 -->
-	<bean id="depotHeadService" class="com.jsh.service.materials.DepotHeadService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="depotHeadDao" ref="depotHeadDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="depotHeadAction" class="com.jsh.action.materials.DepotHeadAction" scope="prototype">
-		<property name="depotHeadService" ref="depotHeadService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--仓管通配置结束 -->
-	
-	<!--仓管通明细配置开始 -->
-	<bean id="depotItemService" class="com.jsh.service.materials.DepotItemService">
-		<property name="baseDao" ref="baseDao"/>
-		<property name="depotItemDao" ref="depotItemDao"/>
-	</bean>
-	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-	<bean id="depotItemAction" class="com.jsh.action.materials.DepotItemAction" scope="prototype">
-		<property name="depotItemService" ref="depotItemService"/>
-		<property name="logService" ref="logService"/>
-	</bean>
-	<!--仓管通明细配置结束 -->
-        
-    <!--结算账户配置开始 -->
-    <bean id="accountService" class="com.jsh.service.basic.AccountService">
-        <property name="baseDao" ref="baseDao"/>
-        <property name="accountDao" ref="accountDao"/>
-    </bean>
-    <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-    <bean id="accountAction" class="com.jsh.action.basic.AccountAction" scope="prototype">
-        <property name="accountService" ref="accountService"/>
-        <property name="logService" ref="logService"/>
-    </bean>
-	<!--结算账户配置结束 -->
-        
-    <!--收支项目配置开始 -->
-    <bean id="inOutItemService" class="com.jsh.service.basic.InOutItemService">
-        <property name="baseDao" ref="baseDao"/>
-        <property name="inOutItemDao" ref="inOutItemDao"/>
-    </bean>
-    <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
-    <bean id="inOutItemAction" class="com.jsh.action.basic.InOutItemAction" scope="prototype">
-        <property name="inOutItemService" ref="inOutItemService"/>
-        <property name="logService" ref="logService"/>
-    </bean>
-	<!--收支项目配置结束 -->
-</beans>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 指定Spring配置文件的Schema信息 -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans 
+	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/tx 
+	http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+	http://www.springframework.org/schema/aop 
+	http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+	<!-- 装载属性配置文件 -->
+	<bean id="propertyConfig"
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="locations" value="classpath:common/jdbc.properties">
+	</property>
+	</bean>
+	<!-- 配置数据源C3P0 -->
+	<bean id="dataSource"
+		class="com.mchange.v2.c3p0.ComboPooledDataSource"
+		destroy-method="close">
+		
+		<property name="jdbcUrl" value="${jdbcUrl}"></property>
+		<property name="driverClass" value="${driverClass}"></property>
+		<property name="user" value="${user}"></property>
+		<property name="password" value="${password}"></property>
+
+		<!--初始化时获取的连接数，取值应在minPoolSize与maxPoolSize之间。Default: 3 -->
+		<property name="initialPoolSize" value="10"/>
+		<!--连接池中保留的最大连接数。Default: 15 -->
+		<property name="maxPoolSize" value="80"/>
+		<!--连接池中保留的最小连接数。-->
+		<property name="minPoolSize" value="3"/>
+		<!--最大空闲时间,60秒内未使用则连接被丢弃。若为0则永不丢弃。Default: 0 -->
+		<property name="maxIdleTime" value="60" />
+		<property name="maxStatements" value="6000"/>
+		<!--当连接池中的连接耗尽的时候c3p0一次同时获取的连接数。Default: 3 -->
+		<property name="acquireIncrement" value="10"/>
+		<!--每60秒检查所有连接池中的空闲连接。Default: 0 -->
+		<property name="idleConnectionTestPeriod" value="60" />
+	</bean>
+	<!-- 配置SessionFactory -->
+	<bean id="sessionFactory"
+		class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+		<property name="dataSource" ref="dataSource"/>
+		<property name="configLocation" value="classpath:hibernate/hibernate.cfg.xml"/>
+	</bean>
+
+	<!-- 配置Hibernate的局部事务管理器，使用HibernateTransactionManager类 -->
+	<!-- 该类实现PlatformTransactionManager接口，是针对Hibernate的特定实现-->
+	<bean id="transactionManager" 
+		class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+		<!-- 配置HibernateTransactionManager时需要依注入SessionFactory的引用 -->
+		<property name="sessionFactory" ref="sessionFactory"/>
+	</bean>
+	
+	<!-- 配置事务切面Bean,指定事务管理器 -->
+	<tx:advice id="txAdvice" transaction-manager="transactionManager">
+		<!-- 用于配置详细的事务语义 -->
+		<tx:attributes>
+			<!-- 所有以'get'开头的方法是read-only的 -->
+			<tx:method name="get*" read-only="true"/>
+			<!-- 其他方法使用默认的事务设置 -->
+			<tx:method name="*"/>
+		</tx:attributes>
+	</tx:advice>
+	
+	<!-- 配置daoTemplate，作为所有DAO组件的模板 -->
+	<bean id="serviceTemplate" abstract="true">
+		<!-- 为DAO组件注入SessionFactory引用 -->
+		<property name="baseDao" ref="baseDao"/>
+	</bean>
+	
+	<!--通用baseservice配置开始 -->
+	<!-- <bean id="baseService"  class="com.jsh.base.BaseService" abstract="true">
+	为DAO组件注入SessionFactory引用
+		<property name="baseDao" ref="baseDao"/>
+	</bean> -->
+	
+	<!--用户配置开始 -->
+	<bean id="userService" class="com.jsh.service.basic.UserService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="userDao" ref="userDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="userAction" class="com.jsh.action.basic.UserAction" scope="prototype">
+		<property name="userService" ref="userService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--用户配置结束 -->
+	
+	<!--日志配置开始 -->
+	<bean id="logService" class="com.jsh.service.basic.LogService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="logDao" ref="logDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="logAction" class="com.jsh.action.basic.LogAction" scope="prototype">
+		<property name="logService" ref="logService"/>
+		<property name="userService" ref="userService"/>
+	</bean>
+	<!--日志配置结束 -->
+	
+	<!--供应商配置开始 -->
+	<bean id="supplierService" class="com.jsh.service.basic.SupplierService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="supplierDao" ref="supplierDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="supplierAction" class="com.jsh.action.basic.SupplierAction" scope="prototype">
+		<property name="supplierService" ref="supplierService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--供应商配置结束 -->
+	
+	<!--分类配置开始 -->
+	<bean id="categoryService" class="com.jsh.service.basic.CategoryService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="categoryDao" ref="categoryDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="categoryAction" class="com.jsh.action.basic.CategoryAction" scope="prototype">
+		<property name="categoryService" ref="categoryService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--分类配置结束 -->
+	
+	
+	<!--仓库配置开始 -->
+	<bean id="depotService" class="com.jsh.service.basic.DepotService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="depotDao" ref="depotDao"/>
+		<property name="userBusinessDao" ref="userBusinessDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="depotAction" class="com.jsh.action.basic.DepotAction" scope="prototype">
+		<property name="depotService" ref="depotService"/>
+		<property name="userBusinessService" ref="userBusinessService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--仓库配置结束 -->
+	
+	<!--应用配置开始 -->
+	<bean id="appService" class="com.jsh.service.basic.AppService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="appDao" ref="appDao"/>
+		<property name="userBusinessDao" ref="userBusinessDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="appAction" class="com.jsh.action.basic.AppAction" scope="prototype">
+		<property name="appService" ref="appService"/>
+		<property name="userBusinessService" ref="userBusinessService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--应用配置结束 -->
+	
+	<!--角色配置开始 -->
+	<bean id="roleService" class="com.jsh.service.basic.RoleService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="roleDao" ref="roleDao"/>
+		<property name="userBusinessDao" ref="userBusinessDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="roleAction" class="com.jsh.action.basic.RoleAction" scope="prototype">
+		<property name="roleService" ref="roleService"/>
+		<property name="userBusinessService" ref="userBusinessService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--角色配置结束 -->
+	
+	<!--功能配置开始 -->
+	<bean id="functionsService" class="com.jsh.service.basic.FunctionsService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="functionsDao" ref="functionsDao"/>	
+		<property name="userBusinessDao" ref="userBusinessDao"/>		
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="functionsAction" class="com.jsh.action.basic.FunctionsAction" scope="prototype">
+		<property name="functionsService" ref="functionsService"/>
+		<property name="userBusinessService" ref="userBusinessService"/>		
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--功能配置结束 -->
+	
+	<!--用户对应关系配置开始 -->
+	<bean id="userBusinessService" class="com.jsh.service.basic.UserBusinessService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="userBusinessDao" ref="userBusinessDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="userBusinessAction" class="com.jsh.action.basic.UserBusinessAction" scope="prototype">
+		<property name="userBusinessService" ref="userBusinessService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--用户对应关系配置结束 -->
+	
+	<!--资产名称配置开始 -->
+	<bean id="assetnameService" class="com.jsh.service.basic.AssetNameService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="assetNameDao" ref="assetNameDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="assetNameAction" class="com.jsh.action.basic.AssetNameAction" scope="prototype">
+		<property name="assetnameService" ref="assetnameService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--资产名称配置结束 -->
+	
+	<!--资产配置开始 -->
+	<bean id="assetService" class="com.jsh.service.asset.AssetService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="assetDao" ref="assetDao"/>
+		<property name="assetNameDao" ref="assetNameDao"/>
+		<property name="categoryDao" ref="categoryDao"/>
+		<property name="supplierDao" ref="supplierDao"/>
+		<property name="userDao" ref="userDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="assetAction" class="com.jsh.action.asset.AssetAction" scope="prototype">
+		<property name="assetService" ref="assetService"/>
+		<property name="categoryService" ref="categoryService"/>
+		<property name="supplierService" ref="supplierService"/>
+		<property name="userService" ref="userService"/>
+		<property name="assetnameService" ref="assetnameService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--资产配置结束 -->
+	
+	<!-- 资产报表配置开始 -->
+	<bean id="reportService" class="com.jsh.service.asset.ReportService">
+		<property name="reportDao" ref="reportDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="reportAction" class="com.jsh.action.asset.ReportAction" scope="prototype">
+		<property name="reportService" ref="reportService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--资产报表配置结束 -->
+	
+	<!--经手人配置开始 -->
+	<bean id="personService" class="com.jsh.service.materials.PersonService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="personDao" ref="personDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="personAction" class="com.jsh.action.materials.PersonAction" scope="prototype">
+		<property name="personService" ref="personService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--经手人配置结束 -->
+	
+	<!--商品类别配置开始 -->
+	<bean id="materialCategoryService" class="com.jsh.service.materials.MaterialCategoryService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="materialCategoryDao" ref="materialCategoryDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="materialCategoryAction" class="com.jsh.action.materials.MaterialCategoryAction" scope="prototype">
+		<property name="materialCategoryService" ref="materialCategoryService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--商品类别配置结束 -->
+	
+	<!--商品配置开始 -->
+	<bean id="materialService" class="com.jsh.service.materials.MaterialService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="materialDao" ref="materialDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="materialAction" class="com.jsh.action.materials.MaterialAction" scope="prototype">
+		<property name="materialService" ref="materialService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--商品配置结束 -->
+	
+	<!--单元配置开始 -->
+	<bean id="buildingService" class="com.jsh.service.materials.BuildingService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="buildingDao" ref="buildingDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="buildingAction" class="com.jsh.action.materials.BuildingAction" scope="prototype">
+		<property name="buildingService" ref="buildingService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--单元配置结束 -->
+	
+	<!--仓管通配置开始 -->
+	<bean id="depotHeadService" class="com.jsh.service.materials.DepotHeadService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="depotHeadDao" ref="depotHeadDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="depotHeadAction" class="com.jsh.action.materials.DepotHeadAction" scope="prototype">
+		<property name="depotHeadService" ref="depotHeadService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--仓管通配置结束 -->
+	
+	<!--仓管通明细配置开始 -->
+	<bean id="depotItemService" class="com.jsh.service.materials.DepotItemService">
+		<property name="baseDao" ref="baseDao"/>
+		<property name="depotItemDao" ref="depotItemDao"/>
+	</bean>
+	<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+	<bean id="depotItemAction" class="com.jsh.action.materials.DepotItemAction" scope="prototype">
+		<property name="depotItemService" ref="depotItemService"/>
+		<property name="logService" ref="logService"/>
+	</bean>
+	<!--仓管通明细配置结束 -->
+        
+    <!--结算账户配置开始 -->
+    <bean id="accountService" class="com.jsh.service.basic.AccountService">
+        <property name="baseDao" ref="baseDao"/>
+        <property name="accountDao" ref="accountDao"/>
+    </bean>
+    <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+    <bean id="accountAction" class="com.jsh.action.basic.AccountAction" scope="prototype">
+        <property name="accountService" ref="accountService"/>
+        <property name="logService" ref="logService"/>
+    </bean>
+	<!--结算账户配置结束 -->
+        
+    <!--收支项目配置开始 -->
+    <bean id="inOutItemService" class="com.jsh.service.basic.InOutItemService">
+        <property name="baseDao" ref="baseDao"/>
+        <property name="inOutItemDao" ref="inOutItemDao"/>
+    </bean>
+    <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+    <bean id="inOutItemAction" class="com.jsh.action.basic.InOutItemAction" scope="prototype">
+        <property name="inOutItemService" ref="inOutItemService"/>
+        <property name="logService" ref="logService"/>
+    </bean>
+	<!--收支项目配置结束 -->
+        
+    <!--账户抬头配置开始 -->
+    <bean id="accountHeadService" class="com.jsh.service.materials.AccountHeadService">
+        <property name="baseDao" ref="baseDao"/>
+        <property name="accountHeadDao" ref="accountHeadDao"/>
+    </bean>
+    <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+    <bean id="accountHeadAction" class="com.jsh.action.materials.AccountHeadAction" scope="prototype">
+        <property name="accountHeadService" ref="accountHeadService"/>
+        <property name="logService" ref="logService"/>
+    </bean>
+    <!--账户抬头配置结束 -->
+
+    <!--账户明细配置开始 -->
+    <bean id="accountItemService" class="com.jsh.service.materials.AccountItemService">
+        <property name="baseDao" ref="baseDao"/>
+        <property name="accountItemDao" ref="accountItemDao"/>
+    </bean>
+    <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+    <bean id="accountItemAction" class="com.jsh.action.materials.AccountItemAction" scope="prototype">
+        <property name="accountItemService" ref="accountItemService"/>
+        <property name="logService" ref="logService"/>
+    </bean>
+	<!--账户明细配置结束 -->
+</beans>
diff --git a/config/spring/dao-applicationContext.xml b/config/spring/dao-applicationContext.xml
index 39317180..e2a57851 100644
--- a/config/spring/dao-applicationContext.xml
+++ b/config/spring/dao-applicationContext.xml
@@ -1,53 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 指定Spring配置文件的DTD信息 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
-	"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
-<beans>
-	<!-- 配置daoTemplate，作为所有DAO组件的模板 -->
-	<bean id="daoTemplate" abstract="true">
-		<!-- 为DAO组件注入SessionFactory引用 -->
-		<property name="sessionFactory" ref="sessionFactory"/>
-	</bean>
-	<!-- 配置通用baseDao组件 -->
-	<bean id="baseDao" parent="daoTemplate" class="com.jsh.base.BaseDAO" scope="prototype"/>
-	<!-- 配置userDao组件 -->
-	<bean id="userDao" parent="daoTemplate" class="com.jsh.dao.basic.UserDAO"/>
-	<!-- 配置logDao组件 -->
-	<bean id="logDao" parent="daoTemplate" class="com.jsh.dao.basic.LogDAO"/>
-	<!-- 配置supplierDao组件 -->
-	<bean id="supplierDao" parent="daoTemplate" class="com.jsh.dao.basic.SupplierDAO"/>
-	<!-- 配置categoryDao组件 -->
-	<bean id="categoryDao" parent="daoTemplate" class="com.jsh.dao.basic.CategoryDAO"/>
-	<!-- 配置depotDao组件 -->
-	<bean id="depotDao" parent="daoTemplate" class="com.jsh.dao.basic.DepotDAO"/>
-	<!-- 配置assetDao组件 -->
-	<bean id="assetNameDao" parent="daoTemplate" class="com.jsh.dao.basic.AssetNameDAO"/>
-	<!-- 配置assetDao组件 -->
-	<bean id="assetDao" parent="daoTemplate" class="com.jsh.dao.asset.AssetDAO"/>
-	<!-- 配置assetDao组件 -->
-	<bean id="reportDao" parent="daoTemplate" class="com.jsh.dao.asset.ReportDAO"/>
-	<!-- 配置appDao组件 -->
-	<bean id="appDao" parent="daoTemplate" class="com.jsh.dao.basic.AppDAO"/>
-	<!-- 配置roleDao组件 -->
-	<bean id="roleDao" parent="daoTemplate" class="com.jsh.dao.basic.RoleDAO"/>	
-	<!-- 配置functionsDao组件 -->
-	<bean id="functionsDao" parent="daoTemplate" class="com.jsh.dao.basic.FunctionsDAO"/>	
-	<!-- 配置userBusinessDao组件 -->
-	<bean id="userBusinessDao" parent="daoTemplate" class="com.jsh.dao.basic.UserBusinessDAO"/>	
-	<!-- 配置personDao组件 -->
-	<bean id="personDao" parent="daoTemplate" class="com.jsh.dao.materials.PersonDAO"/>	
-	<!-- 配置materialCategoryDao组件 -->
-	<bean id="materialCategoryDao" parent="daoTemplate" class="com.jsh.dao.materials.MaterialCategoryDAO"/>	
-	<!-- 配置materialDao组件 -->
-	<bean id="materialDao" parent="daoTemplate" class="com.jsh.dao.materials.MaterialDAO"/>	
-	<!-- 配置buildingDao组件 -->
-	<bean id="buildingDao" parent="daoTemplate" class="com.jsh.dao.materials.BuildingDAO"/>	
-	<!-- 配置depotHeadDao组件 -->
-	<bean id="depotHeadDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotHeadDAO"/>	
-	<!-- 配置depotItemDao组件 -->
-	<bean id="depotItemDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotItemDAO"/>
-	<!-- 配置accountDao组件 -->
-	<bean id="accountDao" parent="daoTemplate" class="com.jsh.dao.basic.AccountDAO"/>	
-	<!-- 配置inOutItemDao组件 -->
-	<bean id="inOutItemDao" parent="daoTemplate" class="com.jsh.dao.basic.InOutItemDAO"/>	
-</beans>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 指定Spring配置文件的DTD信息 -->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
+	"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<beans>
+	<!-- 配置daoTemplate，作为所有DAO组件的模板 -->
+	<bean id="daoTemplate" abstract="true">
+		<!-- 为DAO组件注入SessionFactory引用 -->
+		<property name="sessionFactory" ref="sessionFactory"/>
+	</bean>
+	<!-- 配置通用baseDao组件 -->
+	<bean id="baseDao" parent="daoTemplate" class="com.jsh.base.BaseDAO" scope="prototype"/>
+	<!-- 配置userDao组件 -->
+	<bean id="userDao" parent="daoTemplate" class="com.jsh.dao.basic.UserDAO"/>
+	<!-- 配置logDao组件 -->
+	<bean id="logDao" parent="daoTemplate" class="com.jsh.dao.basic.LogDAO"/>
+	<!-- 配置supplierDao组件 -->
+	<bean id="supplierDao" parent="daoTemplate" class="com.jsh.dao.basic.SupplierDAO"/>
+	<!-- 配置categoryDao组件 -->
+	<bean id="categoryDao" parent="daoTemplate" class="com.jsh.dao.basic.CategoryDAO"/>
+	<!-- 配置depotDao组件 -->
+	<bean id="depotDao" parent="daoTemplate" class="com.jsh.dao.basic.DepotDAO"/>
+	<!-- 配置assetDao组件 -->
+	<bean id="assetNameDao" parent="daoTemplate" class="com.jsh.dao.basic.AssetNameDAO"/>
+	<!-- 配置assetDao组件 -->
+	<bean id="assetDao" parent="daoTemplate" class="com.jsh.dao.asset.AssetDAO"/>
+	<!-- 配置assetDao组件 -->
+	<bean id="reportDao" parent="daoTemplate" class="com.jsh.dao.asset.ReportDAO"/>
+	<!-- 配置appDao组件 -->
+	<bean id="appDao" parent="daoTemplate" class="com.jsh.dao.basic.AppDAO"/>
+	<!-- 配置roleDao组件 -->
+	<bean id="roleDao" parent="daoTemplate" class="com.jsh.dao.basic.RoleDAO"/>	
+	<!-- 配置functionsDao组件 -->
+	<bean id="functionsDao" parent="daoTemplate" class="com.jsh.dao.basic.FunctionsDAO"/>	
+	<!-- 配置userBusinessDao组件 -->
+	<bean id="userBusinessDao" parent="daoTemplate" class="com.jsh.dao.basic.UserBusinessDAO"/>	
+	<!-- 配置personDao组件 -->
+	<bean id="personDao" parent="daoTemplate" class="com.jsh.dao.materials.PersonDAO"/>	
+	<!-- 配置materialCategoryDao组件 -->
+	<bean id="materialCategoryDao" parent="daoTemplate" class="com.jsh.dao.materials.MaterialCategoryDAO"/>	
+	<!-- 配置materialDao组件 -->
+	<bean id="materialDao" parent="daoTemplate" class="com.jsh.dao.materials.MaterialDAO"/>	
+	<!-- 配置buildingDao组件 -->
+	<bean id="buildingDao" parent="daoTemplate" class="com.jsh.dao.materials.BuildingDAO"/>	
+	<!-- 配置depotHeadDao组件 -->
+	<bean id="depotHeadDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotHeadDAO"/>	
+	<!-- 配置depotItemDao组件 -->
+	<bean id="depotItemDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotItemDAO"/>
+	<!-- 配置accountDao组件 -->
+	<bean id="accountDao" parent="daoTemplate" class="com.jsh.dao.basic.AccountDAO"/>	
+	<!-- 配置inOutItemDao组件 -->
+	<bean id="inOutItemDao" parent="daoTemplate" class="com.jsh.dao.basic.InOutItemDAO"/>
+    <!-- 配置accountHeadDao组件 -->
+    <bean id="accountHeadDao" parent="daoTemplate" class="com.jsh.dao.materials.AccountHeadDAO"/>   
+    <!-- 配置accountItemDao组件 -->
+	<bean id="accountItemDao" parent="daoTemplate" class="com.jsh.dao.materials.AccountItemDAO"/>
+</beans>
diff --git a/config/struts2/accountHead-struts.xml b/config/struts2/accountHead-struts.xml
new file mode 100644
index 00000000..927330b6
--- /dev/null
+++ b/config/struts2/accountHead-struts.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+"http://struts.apache.org/dtds/struts-2.1.7.dtd">
+<struts>
+    <package name="accountHead" namespace="/accountHead" extends="json-default">
+        <action name="*" class="accountHeadAction" method="{1}">
+            <result type="json"/>
+        </action>
+    </package>
+</struts>
diff --git a/config/struts2/accountItem-struts.xml b/config/struts2/accountItem-struts.xml
new file mode 100644
index 00000000..c470d14b
--- /dev/null
+++ b/config/struts2/accountItem-struts.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+"http://struts.apache.org/dtds/struts-2.1.7.dtd">
+<struts>
+    <package name="accountItem" namespace="/accountItem" extends="json-default">
+        <action name="*" class="accountItemAction" method="{1}">
+            <result type="json"/>
+        </action>
+    </package>
+</struts>