更新配置

.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>

config/hibernate/hibernate.cfg.xml

@@ -41,5 +41,7 @@
     <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>

config/log4j/log4j.properties

@@ -14,7 +14,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n
 #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.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

config/spring/basic-applicationContext.xml

@@ -333,4 +333,28 @@
         <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>

config/spring/dao-applicationContext.xml

@@ -50,4 +50,8 @@
 	<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>

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>

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>