diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index ab783ffd5..be28acff2 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -546,7 +546,8 @@ - + + @@ -582,15 +583,18 @@ - + + + - + + @@ -1365,9 +1369,10 @@ - + + - + @@ -1377,7 +1382,6 @@ - @@ -1398,18 +1402,22 @@ + - + + + - + + @@ -2307,9 +2315,10 @@ + - + @@ -2343,15 +2352,18 @@ - + + + - + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 1e786220d..2c7182932 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -2341,43 +2341,41 @@ + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + @@ -3376,29 +3374,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - @@ -3604,50 +3631,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 3f221db42..b37ec8dfd 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -100,7 +100,17 @@ GBK - + + + InitCollectConfig + com.amarsoft.app.awe.config.InitCollectConfig + + shutdown-on-unload + true + + 1 + + RewriteRunJavaMethodServlet com.tenwa.workflow.RewriteRunJavaMethodServlet diff --git a/config/applicationContext.xml b/config/applicationContext.xml index 8c0e2bfb9..9d294a4f4 100644 --- a/config/applicationContext.xml +++ b/config/applicationContext.xml @@ -33,20 +33,37 @@ xmlns:p="http://www.springframework.org/schema/p" - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +