引入extjs4.1.1，修改首页展示，登出功能，修改字符集为utf-8

angilin · Mar 24, 2014 · 1a3ccb1 · 1a3ccb1
1 parent 6eabd57
commit 1a3ccb1
Show file tree

Hide file tree

Showing 1,434 changed files with 126,629 additions and 102 deletions.
diff --git a/.myhibernatedata b/.myhibernatedata
@@ -1,5 +1,5 @@
 #
-#Fri Mar 21 10:08:58 CST 2014
+#Fri Mar 21 18:25:46 CST 2014
 genBasicCompId=false
 sessionFactoryName=factory.HibernateSessionFactory
 profile=

diff --git a/.mystrutsdata b/.mystrutsdata
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyEclipseStrutsProperties>
     <strutsVersion>2</strutsVersion>
-    <basePackage>com.acg.struts</basePackage>
+    <basePackage>com.struts</basePackage>
     <strutsPattern>0</strutsPattern>
     <servletName>action</servletName>
 </MyEclipseStrutsProperties>
diff --git a/WebRoot/WEB-INF/.struts-config.mex b/WebRoot/WEB-INF/.struts-config.mex
@@ -3,6 +3,13 @@
   <StrutsActivity path="/login.do" location="50,50" dimension="233,104" />
   <StrutsActivity path="/index.jsp" location="350,50" dimension="88,53" />
   <StrutsActivity path="/login.jsp" location="650,50" dimension="86,53" />
+  <StrutsActivity path="/logout.do" location="950,50" dimension="257,104" />
+  <StrutsTransition id="/logout.do,success,/login.jsp,1" routingType="0">
+    <AutomaticBendpoints>
+      <AbsolutePoint location="950,88" />
+      <AbsolutePoint location="736,88" />
+    </AutomaticBendpoints>
+  </StrutsTransition>
   <StrutsTransition id="/login.jsp,null,/login.do,2" routingType="0">
     <AutomaticBendpoints>
       <AbsolutePoint location="693,103" />

diff --git a/WebRoot/WEB-INF/struts-config.xml b/WebRoot/WEB-INF/struts-config.xml
@@ -20,6 +20,9 @@
       type="com.rbac.action.system.LoginAction">
       <forward name="success" path="/index.jsp" />
     </action>
+    <action path="/logout" type="com.rbac.action.system.LogoutAction">
+      <forward name="success" path="/login.jsp" />
+    </action>
 
   </action-mappings>
 

diff --git a/WebRoot/WEB-INF/web.xml b/WebRoot/WEB-INF/web.xml
@@ -68,7 +68,7 @@
 		</filter-class>
 		<init-param>
 			<param-name>encoding</param-name>
-			<param-value>GBK</param-value>
+			<param-value>UTF-8</param-value>
 		</init-param>
 	</filter>
 	<filter-mapping>

diff --git a/WebRoot/extjs/ext-all.js b/WebRoot/extjs/ext-all.js
diff --git a/WebRoot/extjs/license.txt b/WebRoot/extjs/license.txt
@@ -0,0 +1,35 @@
+Ext JS 4.1 - JavaScript Library
+Copyright (c) 2006-2012, Sencha Inc.
+All rights reserved.
+[email protected]
+
+http://www.sencha.com/license
+
+Open Source License
+------------------------------------------------------------------------------------------
+This version of Ext JS is licensed under the terms of the Open Source GPL 3.0 license. 
+
+http://www.gnu.org/licenses/gpl.html
+
+There are several FLOSS exceptions available for use with this release for
+open source applications that are distributed under a license other than GPL.
+
+* Open Source License Exception for Applications
+
+  http://www.sencha.com/products/floss-exception.php
+
+* Open Source License Exception for Development
+
+  http://www.sencha.com/products/ux-exception.php
+
+
+Alternate Licensing
+------------------------------------------------------------------------------------------
+Commercial and OEM Licenses are available for an alternate download of Ext JS.
+This is the appropriate option if you are creating proprietary applications and you are 
+not prepared to distribute and share the source code of your application under the 
+GPL v3 license. Please visit http://www.sencha.com/license for more details.
+
+--
+
+This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT OF THIRD-PARTY INTELLECTUAL PROPERTY RIGHTS.  See the GNU General Public License for more details.