From 5fb17867cf9172acf19802f57a86342dcd997da9 Mon Sep 17 00:00:00 2001
From: Ray <ray@xxxx.com>
Date: Sat, 4 Mar 2017 00:16:57 +0800
Subject: [PATCH] JavaEE Enterprise Basic Development Platform
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New version 4.2.0-RELEASE_bugfixed.2 release!
# https://github.com/ushelp/EasyEE-Auto/issues/2
# 搜索按钮添加国际化支持
# 修复 mybaits 用户排序问题
# Search  button add i18n support
# Fixed mybatis  sysuser sort problem
---
 .../configuration/MultipartConfiguration.java |   5 -
 .../main/resources/i18n/messages.properties   |   2 +
 .../resources/i18n/messages_en.properties     |   2 +
 .../resources/i18n/messages_zh_CN.properties  |   2 +
 .../webapp/WEB-INF/content/main/hr/Dept.jsp   |   5 +-
 .../webapp/WEB-INF/content/main/hr/Emp.jsp    |   5 +-
 .../WEB-INF/content/main/sys/sysLog.jsp       |   2 +-
 .../WEB-INF/content/main/sys/sysRole.jsp      |   2 +-
 .../WEB-INF/content/main/sys/sysUser.jsp      |   2 +-
 .../sh/base/controller/BaseController.java    |   3 +-
 .../main/resources/i18n/messages.properties   |   2 +
 .../resources/i18n/messages_en.properties     |   2 +
 .../resources/i18n/messages_zh_CN.properties  |   2 +
 .../webapp/WEB-INF/content/main/hr/Dept.jsp   |   4 +-
 .../webapp/WEB-INF/content/main/hr/Emp.jsp    |   3 +-
 .../src/main/webapp/WEB-INF/shiro_temp.ini    | 306 ------------------
 .../sm/base/controller/BaseController.java    |   4 +-
 .../sys/service/impl/SysUserServiceImpl.java  |  15 +-
 .../main/resources/i18n/messages.properties   |   2 +
 .../resources/i18n/messages_en.properties     |   2 +
 .../resources/i18n/messages_zh_CN.properties  |   2 +
 .../webapp/WEB-INF/content/main/hr/Dept.jsp   |   5 +-
 .../webapp/WEB-INF/content/main/hr/Emp.jsp    |   5 +-
 .../WEB-INF/content/main/sys/sysLog.jsp       |   2 +-
 .../WEB-INF/content/main/sys/sysRole.jsp      |   2 +-
 .../WEB-INF/content/main/sys/sysUser.jsp      |   2 +-
 .../sys/service/impl/SysUserServiceImpl.java  |  15 +-
 .../main/resources/i18n/messages.properties   |   2 +
 .../resources/i18n/messages_en.properties     |   2 +
 .../resources/i18n/messages_zh_CN.properties  |   2 +
 .../webapp/WEB-INF/content/main/hr/Dept.jsp   |   5 +-
 .../webapp/WEB-INF/content/main/hr/Emp.jsp    |   5 +-
 .../WEB-INF/content/main/sys/sysLog.jsp       |   2 +-
 .../WEB-INF/content/main/sys/sysRole.jsp      |   2 +-
 .../WEB-INF/content/main/sys/sysUser.jsp      |   2 +-
 .../easyee/ssh/base/action/BaseAction.java    |   2 +-
 .../base/dao/impl/CommonDAOSpringImpl.java    |   2 +-
 .../main/resources/i18n/messages.properties   |   2 +
 .../resources/i18n/messages_en.properties     |   2 +
 .../resources/i18n/messages_zh_CN.properties  |   2 +
 .../webapp/WEB-INF/content/main/hr/Dept.jsp   |   4 +-
 .../webapp/WEB-INF/content/main/hr/Emp.jsp    |   4 +-
 .../WEB-INF/content/main/sys/sysLog.jsp       |   2 +-
 .../WEB-INF/content/main/sys/sysRole.jsp      |   2 +-
 .../WEB-INF/content/main/sys/sysUser.jsp      |   2 +-
 .../WEB-INF/content/main/hr/Dept.jsp          |   4 +-
 .../WEB-INF/content/main/hr/Emp.jsp           |   4 +-
 .../WEB-INF/content/main/sys/sysLog.jsp       |   2 +-
 .../WEB-INF/content/main/sys/sysRole.jsp      |   2 +-
 .../WEB-INF/content/main/sys/sysUser.jsp      |   2 +-
 .../content/main/sys/sysUser_iframe.jsp       |   2 +-
 51 files changed, 108 insertions(+), 359 deletions(-)
 delete mode 100644 project/easyee-sh/src/main/webapp/WEB-INF/shiro_temp.ini

diff --git a/project/easyee-sh-springboot/src/main/java/cn/easyproject/easyee/sh/base/configuration/MultipartConfiguration.java b/project/easyee-sh-springboot/src/main/java/cn/easyproject/easyee/sh/base/configuration/MultipartConfiguration.java
index 35d635b7..22c3e7d6 100644
--- a/project/easyee-sh-springboot/src/main/java/cn/easyproject/easyee/sh/base/configuration/MultipartConfiguration.java
+++ b/project/easyee-sh-springboot/src/main/java/cn/easyproject/easyee/sh/base/configuration/MultipartConfiguration.java
@@ -2,15 +2,10 @@
 
 import javax.servlet.MultipartConfigElement;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.MultipartConfigFactory;
-import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.ReloadableResourceBundleMessageSource;
-import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 
 /**
  * 
diff --git a/project/easyee-sh-springboot/src/main/resources/i18n/messages.properties b/project/easyee-sh-springboot/src/main/resources/i18n/messages.properties
index 84b9f370..67f5a774 100644
--- a/project/easyee-sh-springboot/src/main/resources/i18n/messages.properties
+++ b/project/easyee-sh-springboot/src/main/resources/i18n/messages.properties
@@ -5,11 +5,13 @@ label.add        = Add
 label.cancel     = Cancel
 label.cancelEdit = Cancel Edit
 label.chkbox     = Select
+label.clear      = Clear
 label.delete     = Destory 
 label.edit       = Edit 
 label.info       = \ information
 label.list       = \ List
 label.reset      = Reset
+label.search     = Search
 
 msg.choiceDeleteRow = Please select the row to delete
 msg.choiceEditRow   = Please select the row you want to modify
diff --git a/project/easyee-sh-springboot/src/main/resources/i18n/messages_en.properties b/project/easyee-sh-springboot/src/main/resources/i18n/messages_en.properties
index 84b9f370..67f5a774 100644
--- a/project/easyee-sh-springboot/src/main/resources/i18n/messages_en.properties
+++ b/project/easyee-sh-springboot/src/main/resources/i18n/messages_en.properties
@@ -5,11 +5,13 @@ label.add        = Add
 label.cancel     = Cancel
 label.cancelEdit = Cancel Edit
 label.chkbox     = Select
+label.clear      = Clear
 label.delete     = Destory 
 label.edit       = Edit 
 label.info       = \ information
 label.list       = \ List
 label.reset      = Reset
+label.search     = Search
 
 msg.choiceDeleteRow = Please select the row to delete
 msg.choiceEditRow   = Please select the row you want to modify
diff --git a/project/easyee-sh-springboot/src/main/resources/i18n/messages_zh_CN.properties b/project/easyee-sh-springboot/src/main/resources/i18n/messages_zh_CN.properties
index 22f1f160..e6f666c9 100644
--- a/project/easyee-sh-springboot/src/main/resources/i18n/messages_zh_CN.properties
+++ b/project/easyee-sh-springboot/src/main/resources/i18n/messages_zh_CN.properties
@@ -5,11 +5,13 @@ label.add        = \u6DFB\u52A0
 label.cancel     = \u53D6\u6D88
 label.cancelEdit = \u64A4\u9500\u4FEE\u6539
 label.chkbox     = \u591A\u9009\u6846
+label.clear      = \u6E05\u9664
 label.delete     = \u5220\u9664
 label.edit       = \u4FEE\u6539
 label.info       = \u4FE1\u606F
 label.list       = \u5217\u8868
 label.reset      = \u91CD\u7F6E
+label.search     = \u641C\u7D22
 
 msg.choiceDeleteRow = \u8BF7\u9009\u62E9\u8981\u5220\u9664\u7684\u884C
 msg.choiceEditRow   = \u8BF7\u9009\u62E9\u8981\u4FEE\u6539\u7684\u884C
diff --git a/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp b/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
index 23970945..51eec7df 100644
--- a/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
+++ b/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
@@ -3,6 +3,7 @@
 	String path = request.getContextPath();
 	String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/";
 %>
+<%@ taglib uri="http://www.springframework.org/tags"  prefix="s"%>
 <%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro"%>
 
 <%-- 1. 页面Datagrid初始化相关JS --%>
@@ -83,8 +84,8 @@
 	<form action="" id="DeptSearchForm" onclick="Dept.doSearch()">
 		<span>部门名称:</span> <input name="dname" id="deptName" class="easyui-textbox" />
 		<span>地址:</span> <input name="loc" id="deptLoc" class="easyui-textbox" />
-		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()">Clear</a>
+		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()"><s:message code="label.search"></s:message></a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()"><s:message code="label.clear"></s:message></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton" data-options="iconCls:'icon-add',plain:true" onclick="$('#deptDataGrid').edatagrid('addRow')">添加部门</a>
diff --git a/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp b/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
index 86df9216..d264fbf9 100644
--- a/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
+++ b/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
@@ -5,6 +5,7 @@
 			+ request.getServerName() + ":" + request.getServerPort()
 			+ path + "/";
 %>
+<%@ taglib uri="http://www.springframework.org/tags"  prefix="s"%>
 <%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro"%>
 <%-- 1. 页面Datagrid初始化相关JS --%>
 <%-- JS代码必须包含在页面中，引入外部JS文件会导致表格界面在未完成初始化前就显示，出现短暂的未初始化界面 --%>
@@ -182,8 +183,8 @@
 			id="empDeptno" style="width:90px;"
 			data-options="editable:false,panelHeight:'auto'">
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="Emp.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()">Clear</a>
+			onclick="Emp.doSearch()"><s:message code="label.search"></s:message></a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()"><s:message code="label.clear"></s:message></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp b/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
index 11ea2936..8e01ec35 100644
--- a/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
+++ b/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
@@ -122,7 +122,7 @@
             }]
             ">
 		<a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysLog.doSearch()">Search</a>
+			onclick="sysLog.doSearch()"><s:message code="label.search"></s:message></a>
 	</div>
 	
 </div>
diff --git a/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp b/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
index fcd5616a..8ee4036b 100644
--- a/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
+++ b/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
@@ -172,7 +172,7 @@
 				<option value="0">正常</option>
 				<option value="1">禁用</option>
 			</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-				onclick="sysRole.doSearch()">Search</a>
+				onclick="sysRole.doSearch()"><s:message code="label.search"></s:message></a>
 		</div>
 		<a href="javascript:void(0)" class="easyui-linkbutton"
 			data-options="iconCls:'icon-add',plain:true"
diff --git a/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp b/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
index 48de56f7..f1957753 100644
--- a/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
+++ b/project/easyee-sh-springboot/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
@@ -202,7 +202,7 @@
 			<option value="0">正常</option>
 			<option value="1">禁用</option>
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysUser.doSearch()">Search</a>
+			onclick="sysUser.doSearch()"><s:message code="label.search"></s:message></a>
 	</div>
 	<shiro:hasPermission name="sysUserAddBtn">
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-sh/src/main/java/cn/easyproject/easyee/sh/base/controller/BaseController.java b/project/easyee-sh/src/main/java/cn/easyproject/easyee/sh/base/controller/BaseController.java
index 977887de..42a904b0 100644
--- a/project/easyee-sh/src/main/java/cn/easyproject/easyee/sh/base/controller/BaseController.java
+++ b/project/easyee-sh/src/main/java/cn/easyproject/easyee/sh/base/controller/BaseController.java
@@ -248,6 +248,7 @@ public boolean isNotNullAndEmpty(Object str) {
 	 * 
 	 * @return 当前登录的用户对象
 	 */
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public SysUser getLoginUser() {
 		HttpSession session = request.getSession();
 		SysUser user=new SysUser();
@@ -265,7 +266,7 @@ public SysUser getLoginUser() {
 				String password=c.getMethod("getPassword").invoke(o).toString();
 				
 				user.setUserId(userId);
-				user.setName(realName);
+				user.setName(name);
 				user.setPassword(password);
 				user.setRealName(realName);
 				user.setStatus(status);
diff --git a/project/easyee-sh/src/main/resources/i18n/messages.properties b/project/easyee-sh/src/main/resources/i18n/messages.properties
index 84b9f370..67f5a774 100644
--- a/project/easyee-sh/src/main/resources/i18n/messages.properties
+++ b/project/easyee-sh/src/main/resources/i18n/messages.properties
@@ -5,11 +5,13 @@ label.add        = Add
 label.cancel     = Cancel
 label.cancelEdit = Cancel Edit
 label.chkbox     = Select
+label.clear      = Clear
 label.delete     = Destory 
 label.edit       = Edit 
 label.info       = \ information
 label.list       = \ List
 label.reset      = Reset
+label.search     = Search
 
 msg.choiceDeleteRow = Please select the row to delete
 msg.choiceEditRow   = Please select the row you want to modify
diff --git a/project/easyee-sh/src/main/resources/i18n/messages_en.properties b/project/easyee-sh/src/main/resources/i18n/messages_en.properties
index 84b9f370..67f5a774 100644
--- a/project/easyee-sh/src/main/resources/i18n/messages_en.properties
+++ b/project/easyee-sh/src/main/resources/i18n/messages_en.properties
@@ -5,11 +5,13 @@ label.add        = Add
 label.cancel     = Cancel
 label.cancelEdit = Cancel Edit
 label.chkbox     = Select
+label.clear      = Clear
 label.delete     = Destory 
 label.edit       = Edit 
 label.info       = \ information
 label.list       = \ List
 label.reset      = Reset
+label.search     = Search
 
 msg.choiceDeleteRow = Please select the row to delete
 msg.choiceEditRow   = Please select the row you want to modify
diff --git a/project/easyee-sh/src/main/resources/i18n/messages_zh_CN.properties b/project/easyee-sh/src/main/resources/i18n/messages_zh_CN.properties
index 22f1f160..e6f666c9 100644
--- a/project/easyee-sh/src/main/resources/i18n/messages_zh_CN.properties
+++ b/project/easyee-sh/src/main/resources/i18n/messages_zh_CN.properties
@@ -5,11 +5,13 @@ label.add        = \u6DFB\u52A0
 label.cancel     = \u53D6\u6D88
 label.cancelEdit = \u64A4\u9500\u4FEE\u6539
 label.chkbox     = \u591A\u9009\u6846
+label.clear      = \u6E05\u9664
 label.delete     = \u5220\u9664
 label.edit       = \u4FEE\u6539
 label.info       = \u4FE1\u606F
 label.list       = \u5217\u8868
 label.reset      = \u91CD\u7F6E
+label.search     = \u641C\u7D22
 
 msg.choiceDeleteRow = \u8BF7\u9009\u62E9\u8981\u5220\u9664\u7684\u884C
 msg.choiceEditRow   = \u8BF7\u9009\u62E9\u8981\u4FEE\u6539\u7684\u884C
diff --git a/project/easyee-sh/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp b/project/easyee-sh/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
index 23970945..b120ce35 100644
--- a/project/easyee-sh/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
+++ b/project/easyee-sh/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
@@ -4,7 +4,7 @@
 	String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/";
 %>
 <%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro"%>
-
+<%@ taglib uri="http://www.springframework.org/tags"  prefix="s"%>
 <%-- 1. 页面Datagrid初始化相关JS --%>
 <%-- JS代码必须包含在页面中，引入外部JS文件会导致表格界面在未完成初始化前就显示，出现短暂的未初始化界面 --%>
 <script type="text/javascript">
@@ -84,7 +84,7 @@
 		<span>部门名称:</span> <input name="dname" id="deptName" class="easyui-textbox" />
 		<span>地址:</span> <input name="loc" id="deptLoc" class="easyui-textbox" />
 		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()">Clear</a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()"><s:message code="label.clear"></s:message></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton" data-options="iconCls:'icon-add',plain:true" onclick="$('#deptDataGrid').edatagrid('addRow')">添加部门</a>
diff --git a/project/easyee-sh/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp b/project/easyee-sh/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
index 86df9216..26743b00 100644
--- a/project/easyee-sh/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
+++ b/project/easyee-sh/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
@@ -6,6 +6,7 @@
 			+ path + "/";
 %>
 <%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro"%>
+<%@ taglib uri="http://www.springframework.org/tags"  prefix="s"%>
 <%-- 1. 页面Datagrid初始化相关JS --%>
 <%-- JS代码必须包含在页面中，引入外部JS文件会导致表格界面在未完成初始化前就显示，出现短暂的未初始化界面 --%>
 <script type="text/javascript">
@@ -183,7 +184,7 @@
 			data-options="editable:false,panelHeight:'auto'">
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
 			onclick="Emp.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()">Clear</a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()"><s:message code="label.clear"></s:message></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-sh/src/main/webapp/WEB-INF/shiro_temp.ini b/project/easyee-sh/src/main/webapp/WEB-INF/shiro_temp.ini
deleted file mode 100644
index daa9c550..00000000
--- a/project/easyee-sh/src/main/webapp/WEB-INF/shiro_temp.ini
+++ /dev/null
@@ -1,306 +0,0 @@
-#### ONLY A DEMO, CAN NOT USE! ####
-# -----------------------------------------------------------------------------
-# Users and their (optional) assigned roles
-# username = password, role1, role2, ..., roleN
-# -----------------------------------------------------------------------------
-[users]
-#admin = admin123, admin
-#jay = 123, user
-#guest = guest, guest
-
-# -----------------------------------------------------------------------------
-# Roles with assigned permissions
-# roleName = perm1, perm2, ..., permN
-# -----------------------------------------------------------------------------
-[roles]
-#admin = *
-#user = log:*
-
-
-# -----------------------------------------------------------------------------
-# Configuration SessionManager, Cache, Filter
-# myFilter = com.company.web.some.FilterImplementation
-# myFilter.property1 = value1
-# -----------------------------------------------------------------------------
-
-[main]
-#- Session Manager
-# securityManager.sessionManager.xxxx=xxxx
-
-#-- Shiro Native SessionManager
-sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager
-# Use the configured native session manager:
-securityManager.sessionManager = $sessionManager
-
-#-- Session Timeout
-# 3,600,000 milliseconds = 1 hour
-securityManager.sessionManager.globalSessionTimeout = 3600000
-
-#-- Session Listeners
-# implement the SessionListener interface (or extend the convenience SessionListenerAdapter) 
-# As the default SessionManager sessionListeners property is a collection, you can configure the SessionManager with one or more of your listener implementations like any other collection in shiro.ini:
-#aSessionListener = com.foo.my.SessionListener
-#anotherSessionListener = com.foo.my.OtherSessionListener
-#securityManager.sessionManager.sessionListeners = $aSessionListener, $anotherSessionListener, etc.
-
-
-#-- Custom Session IDs
-# The default SessionIdGenerator is a JavaUuidSessionIdGenerator, 
-# which generates String IDs based on Java UUIDs. 
-#sessionIdGenerator = com.my.session.SessionIdGenerator
-#securityManager.sessionManager.sessionDAO.sessionIdGenerator = $sessionIdGenerator
-
-
-#-- SessionValidationScheduler
-# Sessions are only validated to see 
-# if they have been stopped or expired at the time they are accessed, 
-# A SessionValidationScheduler is responsible for validating sessions 
-# at a periodic rate to ensure they are cleaned up as necessary.
-# You can custom SessionValidationScheduler implementation class.
-sessionValidationScheduler = org.apache.shiro.session.mgt.ExecutorServiceSessionValidationScheduler
-# Default is 3,600,000 millis = 1 hour:
-sessionValidationScheduler.interval = 3600000
-securityManager.sessionManager.sessionValidationScheduler = $sessionValidationScheduler
-#securityManager.sessionManager.sessionValidationSchedulerEnabled = false
-
-
-#-- Session DAO
-# cache in the CacheManager should be used to store active sessions:
-sessionDAO = org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO
-securityManager.sessionManager.sessionDAO = $sessionDAO
-# By default, the EnterpriseCacheSessionDAO asks the CacheManager 
-# for a Cache named "shiro-activeSessionCache"
-#sessionDAO.activeSessionsCacheName = ehcache_region_name
-
-
-#- Cache
-# securityManager.cacheManager
-
-#-- EhCache
-cacheManager = org.apache.shiro.cache.ehcache.EhCacheManager
-cacheManager.cacheManagerConfigFile = classpath:ehcache.xml
-##-- in-memory-only Cache
-#cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager
-securityManager.cacheManager = $cacheManager
-
-#- RememeberMe(org.apache.shiro.web.mgt.CookieRememberMeManager)
-securityManager.rememberMeManager.cookie.name = rememberMe
-# default is /request.getContextPath()
-securityManager.rememberMeManager.cookie.path = /
-# default is ONE_YEAR
-securityManager.rememberMeManager.cookie.maxAge = 31536000
-
-
-#------------------------------ When use Session Clustering: Ehcache + Terracotta
-#sessionDAO = org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO
-## This name matches a cache name in ehcache.xml:
-#sessionDAO.activeSessionsCacheName = shiro-activeSessionsCache
-#securityManager.sessionManager.sessionDAO = $sessionDAO
-#
-## Configure The EhCacheManager:
-#cacheManager = org.apache.shiro.cache.ehcache.EhCacheManager
-#cacheManager.cacheManagerConfigFile = classpath:ehcache.xml
-#
-## Configure the above CacheManager on Shiro's SecurityManager
-## to use it for all of Shiro's caching needs:
-#securityManager.cacheManager = $cacheManager
-#------------------------------ When use Session Clustering: Ehcache + Terracotta
-
-#- Realm
-
-#-- DataSource
-dataSource=com.alibaba.druid.pool.DruidDataSource  
-dataSource.url=jdbc:mysql://127.0.0.1:3306/easyssh
-dataSource.username=root  
-dataSource.password=root  
-dataSource.initialSize=1
-dataSource.minIdle=1 
-dataSource.maxActive=20
-dataSource.maxWait=60000
-dataSource.timeBetweenEvictionRunsMillis=60000
-dataSource.minEvictableIdleTimeMillis=300000
-dataSource.validationQuery=SELECT 'x'
-dataSource.testWhileIdle=true
-dataSource.testOnBorrow=false
-dataSource.testOnReturn=false
-dataSource.poolPreparedStatements=false
-dataSource.maxPoolPreparedStatementPerConnectionSize=20
-
-
-#-- EasyJdbcRealm
-#jdbcRealm=org.apache.shiro.realm.jdbc.JdbcRealm
-jdbcRealm=cn.easyproject.easyshiro.EasyJdbcRealm
-jdbcRealm.dataSource=$dataSource  
-# 认证信息查询语句; default: select * from users where username = ?
-jdbcRealm.authenticationQuery=select user_id as userid,name,password,status,real_name as realname from sys_user where name=? and status in(0,1)
-# 密码列列名; default: password
-jdbcRealm.passwordColumn=password
-# 角色查询语句(支持多个username=?); default: select role_name from user_roles where username = ? 
-jdbcRealm.userRolesQuery=select name from sys_role where role_id in (select role_id from sys_user_role where user_id=(select user_id from sys_user where name=?)) and status=0 
-# 是否执行permissionsQuery权限查询; default: true
-jdbcRealm.permissionsLookupEnabled=true
-# 权限查询语句(支持多个username=?); default: select permission from roles_permissions where role_name = ?" 
-jdbcRealm.permissionsQuery=select action from sys_menu where MENU_PERMISSION_ID in( select MENU_PERMISSION_ID from sys_role_menu where ROLE_ID in(select role_id from sys_user_role where user_id=(select user_id from sys_user where name=?))) UNION select action from sys_operation where OPERATION_PERMISSION_ID in(select OPERATION_PERMISSION_ID from sys_role_operation where ROLE_ID in(select role_id from sys_user_role where user_id=(select user_id from sys_user where name=?)))  
-# EasyJdbcRealm 拦截器，可以认证和授权信息获得后，对SimpleAuthenticationInfo认证和SimpleAuthorizationInfo授权信息进行额外处理
-jdbcRealm.interceptor=$realmInterceptor
-# 自定义 EasyJdbcRealm 拦截器，可以认证和授权信息获得后，对SimpleAuthenticationInfo认证和SimpleAuthorizationInfo授权信息进行额外处理
-realmInterceptor=cn.easyproject.easyee.sh.sys.shiro.RealmInterceptor
-jdbcRealm.interceptor=$realmInterceptor
-
-
-
-securityManager.realms=$jdbcRealm 
-
-
-
-#- auth Login Authentication
-
-#-- 自定义 auth
-#auth=cn.easyproject.easyshiro.EasyFormAuthenticationFilter
-auth=cn.easyproject.easyshiro.EasyFormAuthenticationFilter
-# specify login form page
-# when request method is post execute login, else to login page view
-auth.loginUrl = /toLogin
-# redirect after successful login
-auth.successUrl = /toMain
-# name of request parameter with username; if not present filter assumes 'username'
-auth.usernameParam = name
-# name of request parameter with password; if not present filter assumes 'password'
-auth.passwordParam = password
-# does the user wish to be remembered?; if not present filter assumes 'rememberMe'
-auth.rememberMeParam = rememberMe
-
-#-- EasyFormAuthenticationFilter 自定义扩展属性
-#---- Login Configuration
-# 登录成功，将 token 存入 session 的 key; default is 'TOKEN'
-# session.setAttribute(sessionTokenName,tokenObject); 
-auth.sessionTokenKey= TOKEN
-# 是否使用登录失败以重定向方式跳转回登录页面; default is 'false'
-auth.loginFailureRedirectToLogin = true
-
-#---- User defined UsernamePasswordToken Configuration
-# 自定义 UsernamePasswordToken; Default is 'org.apache.shiro.auth.UsernamePasswordToken'
-auth.tokenClassName=cn.easyproject.easyee.sh.sys.shiro.UsernamePasswordEncodeToken
-
-#---- CAPTCHA Configuration
-# 是否开启验证码; default 'true'
-auth.enableCaptcha=true
-# 验证码参数名; default 'captcha'
-auth.captchaParam = captcha
-# Session中存储验证码值得可以; default 'captcha'
-auth.sessionCaptchaKey = rand
-
-
-#---------  AutoLogin Configuration 
-# 是否开启自动登录 
-auth.enableAutoLogin=false
-# 自动登录参数数名 
-auth.autoLoginParam=autoLogin
-# Cookie maxAge ，default is ONE_YEAR 
-auth.autoLoginMaxAge=31536000
-# Cookie path，default is "" 
-auth.autoLoginPath=/
-# Cookie domain，empty or default is your current domain name 
-#auth.autoLoginDomain=
-
-#---- LockLogin Configuration 登录失败相关错误消息
-# 是否开启LockLogin用户登录锁定；默认为false，不开启
-auth.enableLockLogin=false
-# Shiro CacheManager 
-auth.ehCacheManager=$cacheManager
-# LockLogin 管理锁定时间周期的 EHCache 缓存名称；默认为 shiro-lockLoginCache
-auth.lockLoginCacheName=shiro-lockLoginCache
-# LockLogin 统计登录错误次数时间周期的 EHCache 缓存名称；默认为 shiro-lockCheckCache 
-auth.lockCheckCacheName=shiro-lockCheckCache
-# 同一用户名登录达到登录错误次数，登录锁定；0为不限制；默认为6 
-auth.userLock=4
-#  同一IP登录达到错误次数，登录锁定；0为不限制；默认为15 
-auth.ipLock=6
-# 达到指定登录错误次数，显示验证码；-1为不控制验证码显示；默认为1 
-auth.showCaptcha=2
-
-
-
-#---- 登录失败相关错误消息
-# 登录失败，消息 key 
-auth.msgKey = MSG
-# 将消息存入session，session.setAttribute(MsgKey,xxxErrorMsg); default is 'false'
-auth.sessionMsg = true
-# 将消息存入request，request.setAttribute(MsgKey,xxxErrorMsg); default is 'false'
-auth.requestMsg = true
-# 登录错误的，异常提示内容 Map
-# ExceptionClassName:"Message", ExceptionClassName2:"Message2", ...
-auth.exceptionMsg = LockedAccountException:"账户锁定，请联系管理员解锁。", AuthenticationException:"用户名，或密码有误！", EasyIncorrectCaptchaException:"验证码有误！", EasyLockUserException:"由于该用户连续登录错误，暂时被锁定 2 小时，请稍后再试。", EasyLockIPException:"由于该IP连续登录错误，暂时被锁定 2 小时，请稍后再试。"
-
-
-#---- 自定义 EasyJdbcRealmInterceptor 拦截器，可以在认证成功或失败后进行自定义代码处理
-authenticationInterceptor=cn.easyproject.easyee.sh.sys.shiro.AuthenticationInterceptor
-auth.interceptor=$authenticationInterceptor
-
-
-
-#- user Authentication
-# user filter, if not remeberMe redirected to the url, default is '/login.jsp'
-user.loginUrl=/login.jsp
-
-
-#- Logout
-# specify LogoutFilter
-# logout = org.apache.shiro.web.filter.authc.LogoutFilter
-# specify logout redirectUrl
-logout=cn.easyproject.easyshiro.EasyLogoutFilter
-logout.redirectUrl = /login.jsp
-# EasyFormAuthenticationFilter
-logout.easyFormAuthenticationFilter=$auth
-
-
-#- perms 
-## 自定义基于 URL规则 授权过滤器
-perms=cn.easyproject.easyshiro.EasyURLPermissionFilter
-# 权限验证失败，转向的url
-perms.unauthorizedUrl=/login.jsp
-# 是否开启登录超时检测; default is 'true'
-perms.authenticationTimeoutCheck= true
-
-## 权限验证失败相关错误消息
-# 权限验证失败，消息 key; default is 'msg' 
-perms.msgKey = msg
-# 权限验证失败，状态码 key：301，登录超时; 401，权限拒绝; default is 'statusCode' 
-perms.statusCode = statusCode
-# 将消息存入session，session.setAttribute(MsgKey,xxxErrorMsg); default is 'false'
-perms.sessionMsg = true
-# 将消息存入request，request.setAttribute(MsgKey,xxxErrorMsg); default is 'false'
-perms.requestMsg = true
-# 认证失败提示内容;  default is 'Permission denied!'
-perms.permissionDeniedMsg = 您没有权限！
-# 登录超时提示内容; default is 'Your login has expired, please login again!'
-perms.authenticationTimeoutMsg = 您的登录已过期，请重新登录！
-
-
-
-# -----------------------------------------------------------------------------
-# Urls and their filter
-# URL_Ant_Path_Expression = Path_Specific_Filter_Chain
-# filter1[optional_config1], filter2[optional_config2], ..., filterN[optional_configN]
-# -----------------------------------------------------------------------------
-[urls]
- # anonymous
-/checkCaptcha = anon
-/notFound = anon
-
-# requests to /DoLogout will be handled by the ‘logout’ filter
-/logout = logout
-
-# requests to /toLogin will be handled by the ‘auth’ filter
-/toLogin = auth
-
-# doc page need auth
-/doc/** = auth
-
-# need to permission
-/toMain = auth
-/* =  perms
-
-
-
-
diff --git a/project/easyee-sm-springboot/src/main/java/cn/easyproject/easyee/sm/base/controller/BaseController.java b/project/easyee-sm-springboot/src/main/java/cn/easyproject/easyee/sm/base/controller/BaseController.java
index d8ff04c1..5c233e55 100644
--- a/project/easyee-sm-springboot/src/main/java/cn/easyproject/easyee/sm/base/controller/BaseController.java
+++ b/project/easyee-sm-springboot/src/main/java/cn/easyproject/easyee/sm/base/controller/BaseController.java
@@ -227,7 +227,7 @@ public PageBean getPageBean() {
 		int rows = ServletRequestUtils.getIntParameter(request, "rows", 10);
 		String sort = ServletRequestUtils.getStringParameter(request, "sort", "");
 		String order = ServletRequestUtils.getStringParameter(request, "order", "");
-
+		
 		pb.setPageNo(page);
 		pb.setRowsPerPage(rows);
 		// 分页排序
@@ -242,7 +242,7 @@ public PageBean getPageBean() {
 		if (isNotNullAndEmpty(order)) {
 			pb.setSortOrder(order);
 		}
-
+		
 		return pb;
 	}
 
diff --git a/project/easyee-sm-springboot/src/main/java/cn/easyproject/easyee/sm/sys/service/impl/SysUserServiceImpl.java b/project/easyee-sm-springboot/src/main/java/cn/easyproject/easyee/sm/sys/service/impl/SysUserServiceImpl.java
index 9e9eae96..cd5fa1ce 100644
--- a/project/easyee-sm-springboot/src/main/java/cn/easyproject/easyee/sm/sys/service/impl/SysUserServiceImpl.java
+++ b/project/easyee-sm-springboot/src/main/java/cn/easyproject/easyee/sm/sys/service/impl/SysUserServiceImpl.java
@@ -68,6 +68,17 @@ public void findByPage(PageBean pb,SysUserCriteria sysUserCriteria) {
 			condition=pb.getEasyCriteria().getCondition();
 			pb.setSqlParameterValues(pb.getEasyCriteria().getValues());
 		}
+		
+		String sort="USER_ID";
+		String sortOrder="ASC";
+		
+		if(isNotNullAndEmpty(pb.getSort())){
+			sort=pb.getSort();
+		}
+		if(isNotNullAndEmpty(pb.getSortOrder())){
+			sortOrder=pb.getSortOrder();
+		}
+		
 		if(pb.getDialect()==PageBean.MYSQL_DIALECT){
 			pb.setSql("select A.* from ("
 					+ "SELECT s.*,r.role_id AS ROLE_ID,r.name AS ROLE_NAME "
@@ -77,7 +88,7 @@ public void findByPage(PageBean pb,SysUserCriteria sysUserCriteria) {
 					+ " ) A"
 					+ " WHERE 1=1 "
 					+  condition
-					+ " order by A.USER_ID ASC limit "+((pb.getPageNo()-1)*pb.getRowsPerPage())+","+pb.getRowsPerPage());
+					+ " order by A."+sort+" "+sortOrder+" limit "+((pb.getPageNo()-1)*pb.getRowsPerPage())+","+pb.getRowsPerPage());
 		}else if(pb.getDialect()==PageBean.ORACLE_DIALECT || pb.getDialect()==PageBean.ORACLE_12C_DIALECT){
 			int start=((pb.getPageNo()-1)*pb.getRowsPerPage());
 			int end=start+pb.getRowsPerPage();
@@ -89,7 +100,7 @@ public void findByPage(PageBean pb,SysUserCriteria sysUserCriteria) {
 					+ " ) A"
 					+ " WHERE 1=1 "
 					+  condition
-					+ " order by A.USER_ID ASC";
+					+ " order by A."+sort+" "+sortOrder;
 			
 			 sql="select * from ("
 					+ "select B.*,rownum r from ("+sql+") B where rownum<="+end
diff --git a/project/easyee-sm-springboot/src/main/resources/i18n/messages.properties b/project/easyee-sm-springboot/src/main/resources/i18n/messages.properties
index 84b9f370..67f5a774 100644
--- a/project/easyee-sm-springboot/src/main/resources/i18n/messages.properties
+++ b/project/easyee-sm-springboot/src/main/resources/i18n/messages.properties
@@ -5,11 +5,13 @@ label.add        = Add
 label.cancel     = Cancel
 label.cancelEdit = Cancel Edit
 label.chkbox     = Select
+label.clear      = Clear
 label.delete     = Destory 
 label.edit       = Edit 
 label.info       = \ information
 label.list       = \ List
 label.reset      = Reset
+label.search     = Search
 
 msg.choiceDeleteRow = Please select the row to delete
 msg.choiceEditRow   = Please select the row you want to modify
diff --git a/project/easyee-sm-springboot/src/main/resources/i18n/messages_en.properties b/project/easyee-sm-springboot/src/main/resources/i18n/messages_en.properties
index 84b9f370..67f5a774 100644
--- a/project/easyee-sm-springboot/src/main/resources/i18n/messages_en.properties
+++ b/project/easyee-sm-springboot/src/main/resources/i18n/messages_en.properties
@@ -5,11 +5,13 @@ label.add        = Add
 label.cancel     = Cancel
 label.cancelEdit = Cancel Edit
 label.chkbox     = Select
+label.clear      = Clear
 label.delete     = Destory 
 label.edit       = Edit 
 label.info       = \ information
 label.list       = \ List
 label.reset      = Reset
+label.search     = Search
 
 msg.choiceDeleteRow = Please select the row to delete
 msg.choiceEditRow   = Please select the row you want to modify
diff --git a/project/easyee-sm-springboot/src/main/resources/i18n/messages_zh_CN.properties b/project/easyee-sm-springboot/src/main/resources/i18n/messages_zh_CN.properties
index 22f1f160..e6f666c9 100644
--- a/project/easyee-sm-springboot/src/main/resources/i18n/messages_zh_CN.properties
+++ b/project/easyee-sm-springboot/src/main/resources/i18n/messages_zh_CN.properties
@@ -5,11 +5,13 @@ label.add        = \u6DFB\u52A0
 label.cancel     = \u53D6\u6D88
 label.cancelEdit = \u64A4\u9500\u4FEE\u6539
 label.chkbox     = \u591A\u9009\u6846
+label.clear      = \u6E05\u9664
 label.delete     = \u5220\u9664
 label.edit       = \u4FEE\u6539
 label.info       = \u4FE1\u606F
 label.list       = \u5217\u8868
 label.reset      = \u91CD\u7F6E
+label.search     = \u641C\u7D22
 
 msg.choiceDeleteRow = \u8BF7\u9009\u62E9\u8981\u5220\u9664\u7684\u884C
 msg.choiceEditRow   = \u8BF7\u9009\u62E9\u8981\u4FEE\u6539\u7684\u884C
diff --git a/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp b/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
index 23970945..51eec7df 100644
--- a/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
+++ b/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
@@ -3,6 +3,7 @@
 	String path = request.getContextPath();
 	String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/";
 %>
+<%@ taglib uri="http://www.springframework.org/tags"  prefix="s"%>
 <%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro"%>
 
 <%-- 1. 页面Datagrid初始化相关JS --%>
@@ -83,8 +84,8 @@
 	<form action="" id="DeptSearchForm" onclick="Dept.doSearch()">
 		<span>部门名称:</span> <input name="dname" id="deptName" class="easyui-textbox" />
 		<span>地址:</span> <input name="loc" id="deptLoc" class="easyui-textbox" />
-		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()">Clear</a>
+		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()"><s:message code="label.search"></s:message></a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()"><s:message code="label.clear"></s:message></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton" data-options="iconCls:'icon-add',plain:true" onclick="$('#deptDataGrid').edatagrid('addRow')">添加部门</a>
diff --git a/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp b/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
index 86df9216..d264fbf9 100644
--- a/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
+++ b/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
@@ -5,6 +5,7 @@
 			+ request.getServerName() + ":" + request.getServerPort()
 			+ path + "/";
 %>
+<%@ taglib uri="http://www.springframework.org/tags"  prefix="s"%>
 <%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro"%>
 <%-- 1. 页面Datagrid初始化相关JS --%>
 <%-- JS代码必须包含在页面中，引入外部JS文件会导致表格界面在未完成初始化前就显示，出现短暂的未初始化界面 --%>
@@ -182,8 +183,8 @@
 			id="empDeptno" style="width:90px;"
 			data-options="editable:false,panelHeight:'auto'">
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="Emp.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()">Clear</a>
+			onclick="Emp.doSearch()"><s:message code="label.search"></s:message></a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()"><s:message code="label.clear"></s:message></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp b/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
index 11ea2936..8e01ec35 100644
--- a/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
+++ b/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
@@ -122,7 +122,7 @@
             }]
             ">
 		<a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysLog.doSearch()">Search</a>
+			onclick="sysLog.doSearch()"><s:message code="label.search"></s:message></a>
 	</div>
 	
 </div>
diff --git a/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp b/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
index f9a7390d..5558e679 100644
--- a/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
+++ b/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
@@ -172,7 +172,7 @@
 				<option value="0">正常</option>
 				<option value="1">禁用</option>
 			</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-				onclick="sysRole.doSearch()">Search</a>
+				onclick="sysRole.doSearch()"><s:message code="label.search"></s:message></a>
 		</div>
 		<a href="javascript:void(0)" class="easyui-linkbutton"
 			data-options="iconCls:'icon-add',plain:true"
diff --git a/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp b/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
index 4fe91417..88ba6f1e 100644
--- a/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
+++ b/project/easyee-sm-springboot/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
@@ -203,7 +203,7 @@
 			<option value="0">正常</option>
 			<option value="1">禁用</option>
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysUser.doSearch()">Search</a>
+			onclick="sysUser.doSearch()"><s:message code="label.search"></s:message></a>
 	</div>
 	<shiro:hasPermission name="sysUserAddBtn">
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-sm/src/main/java/cn/easyproject/easyee/sm/sys/service/impl/SysUserServiceImpl.java b/project/easyee-sm/src/main/java/cn/easyproject/easyee/sm/sys/service/impl/SysUserServiceImpl.java
index 9e9eae96..4229de38 100644
--- a/project/easyee-sm/src/main/java/cn/easyproject/easyee/sm/sys/service/impl/SysUserServiceImpl.java
+++ b/project/easyee-sm/src/main/java/cn/easyproject/easyee/sm/sys/service/impl/SysUserServiceImpl.java
@@ -64,6 +64,17 @@ public SysUser get(int id) {
 	public void findByPage(PageBean pb,SysUserCriteria sysUserCriteria) {
 		pb.setEasyCriteria(sysUserCriteria);
 		String condition="";
+		
+		String sort="USER_ID";
+		String sortOrder="ASC";
+		
+		if(isNotNullAndEmpty(pb.getSort())){
+			sort=pb.getSort();
+		}
+		if(isNotNullAndEmpty(pb.getSortOrder())){
+			sortOrder=pb.getSortOrder();
+		}
+		
 		if(pb.getEasyCriteria()!=null){
 			condition=pb.getEasyCriteria().getCondition();
 			pb.setSqlParameterValues(pb.getEasyCriteria().getValues());
@@ -77,7 +88,7 @@ public void findByPage(PageBean pb,SysUserCriteria sysUserCriteria) {
 					+ " ) A"
 					+ " WHERE 1=1 "
 					+  condition
-					+ " order by A.USER_ID ASC limit "+((pb.getPageNo()-1)*pb.getRowsPerPage())+","+pb.getRowsPerPage());
+					+ " order by A."+sort+" "+sortOrder+" limit "+((pb.getPageNo()-1)*pb.getRowsPerPage())+","+pb.getRowsPerPage());
 		}else if(pb.getDialect()==PageBean.ORACLE_DIALECT || pb.getDialect()==PageBean.ORACLE_12C_DIALECT){
 			int start=((pb.getPageNo()-1)*pb.getRowsPerPage());
 			int end=start+pb.getRowsPerPage();
@@ -89,7 +100,7 @@ public void findByPage(PageBean pb,SysUserCriteria sysUserCriteria) {
 					+ " ) A"
 					+ " WHERE 1=1 "
 					+  condition
-					+ " order by A.USER_ID ASC";
+					+ " order by A."+sort+" "+sortOrder;
 			
 			 sql="select * from ("
 					+ "select B.*,rownum r from ("+sql+") B where rownum<="+end
diff --git a/project/easyee-sm/src/main/resources/i18n/messages.properties b/project/easyee-sm/src/main/resources/i18n/messages.properties
index 84b9f370..67f5a774 100644
--- a/project/easyee-sm/src/main/resources/i18n/messages.properties
+++ b/project/easyee-sm/src/main/resources/i18n/messages.properties
@@ -5,11 +5,13 @@ label.add        = Add
 label.cancel     = Cancel
 label.cancelEdit = Cancel Edit
 label.chkbox     = Select
+label.clear      = Clear
 label.delete     = Destory 
 label.edit       = Edit 
 label.info       = \ information
 label.list       = \ List
 label.reset      = Reset
+label.search     = Search
 
 msg.choiceDeleteRow = Please select the row to delete
 msg.choiceEditRow   = Please select the row you want to modify
diff --git a/project/easyee-sm/src/main/resources/i18n/messages_en.properties b/project/easyee-sm/src/main/resources/i18n/messages_en.properties
index 84b9f370..67f5a774 100644
--- a/project/easyee-sm/src/main/resources/i18n/messages_en.properties
+++ b/project/easyee-sm/src/main/resources/i18n/messages_en.properties
@@ -5,11 +5,13 @@ label.add        = Add
 label.cancel     = Cancel
 label.cancelEdit = Cancel Edit
 label.chkbox     = Select
+label.clear      = Clear
 label.delete     = Destory 
 label.edit       = Edit 
 label.info       = \ information
 label.list       = \ List
 label.reset      = Reset
+label.search     = Search
 
 msg.choiceDeleteRow = Please select the row to delete
 msg.choiceEditRow   = Please select the row you want to modify
diff --git a/project/easyee-sm/src/main/resources/i18n/messages_zh_CN.properties b/project/easyee-sm/src/main/resources/i18n/messages_zh_CN.properties
index 22f1f160..e6f666c9 100644
--- a/project/easyee-sm/src/main/resources/i18n/messages_zh_CN.properties
+++ b/project/easyee-sm/src/main/resources/i18n/messages_zh_CN.properties
@@ -5,11 +5,13 @@ label.add        = \u6DFB\u52A0
 label.cancel     = \u53D6\u6D88
 label.cancelEdit = \u64A4\u9500\u4FEE\u6539
 label.chkbox     = \u591A\u9009\u6846
+label.clear      = \u6E05\u9664
 label.delete     = \u5220\u9664
 label.edit       = \u4FEE\u6539
 label.info       = \u4FE1\u606F
 label.list       = \u5217\u8868
 label.reset      = \u91CD\u7F6E
+label.search     = \u641C\u7D22
 
 msg.choiceDeleteRow = \u8BF7\u9009\u62E9\u8981\u5220\u9664\u7684\u884C
 msg.choiceEditRow   = \u8BF7\u9009\u62E9\u8981\u4FEE\u6539\u7684\u884C
diff --git a/project/easyee-sm/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp b/project/easyee-sm/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
index 23970945..51eec7df 100644
--- a/project/easyee-sm/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
+++ b/project/easyee-sm/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
@@ -3,6 +3,7 @@
 	String path = request.getContextPath();
 	String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/";
 %>
+<%@ taglib uri="http://www.springframework.org/tags"  prefix="s"%>
 <%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro"%>
 
 <%-- 1. 页面Datagrid初始化相关JS --%>
@@ -83,8 +84,8 @@
 	<form action="" id="DeptSearchForm" onclick="Dept.doSearch()">
 		<span>部门名称:</span> <input name="dname" id="deptName" class="easyui-textbox" />
 		<span>地址:</span> <input name="loc" id="deptLoc" class="easyui-textbox" />
-		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()">Clear</a>
+		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()"><s:message code="label.search"></s:message></a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()"><s:message code="label.clear"></s:message></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton" data-options="iconCls:'icon-add',plain:true" onclick="$('#deptDataGrid').edatagrid('addRow')">添加部门</a>
diff --git a/project/easyee-sm/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp b/project/easyee-sm/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
index 86df9216..d264fbf9 100644
--- a/project/easyee-sm/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
+++ b/project/easyee-sm/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
@@ -5,6 +5,7 @@
 			+ request.getServerName() + ":" + request.getServerPort()
 			+ path + "/";
 %>
+<%@ taglib uri="http://www.springframework.org/tags"  prefix="s"%>
 <%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro"%>
 <%-- 1. 页面Datagrid初始化相关JS --%>
 <%-- JS代码必须包含在页面中，引入外部JS文件会导致表格界面在未完成初始化前就显示，出现短暂的未初始化界面 --%>
@@ -182,8 +183,8 @@
 			id="empDeptno" style="width:90px;"
 			data-options="editable:false,panelHeight:'auto'">
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="Emp.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()">Clear</a>
+			onclick="Emp.doSearch()"><s:message code="label.search"></s:message></a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()"><s:message code="label.clear"></s:message></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp b/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
index 11ea2936..8e01ec35 100644
--- a/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
+++ b/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
@@ -122,7 +122,7 @@
             }]
             ">
 		<a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysLog.doSearch()">Search</a>
+			onclick="sysLog.doSearch()"><s:message code="label.search"></s:message></a>
 	</div>
 	
 </div>
diff --git a/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp b/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
index bff0fca3..c411a771 100644
--- a/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
+++ b/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
@@ -172,7 +172,7 @@
 				<option value="0">正常</option>
 				<option value="1">禁用</option>
 			</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-				onclick="sysRole.doSearch()">Search</a>
+				onclick="sysRole.doSearch()"><s:message code="label.search"></s:message></a>
 		</div>
 		<a href="javascript:void(0)" class="easyui-linkbutton"
 			data-options="iconCls:'icon-add',plain:true"
diff --git a/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp b/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
index 48de56f7..f1957753 100644
--- a/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
+++ b/project/easyee-sm/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
@@ -202,7 +202,7 @@
 			<option value="0">正常</option>
 			<option value="1">禁用</option>
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysUser.doSearch()">Search</a>
+			onclick="sysUser.doSearch()"><s:message code="label.search"></s:message></a>
 	</div>
 	<shiro:hasPermission name="sysUserAddBtn">
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-ssh/src/main/java/cn/easyproject/easyee/ssh/base/action/BaseAction.java b/project/easyee-ssh/src/main/java/cn/easyproject/easyee/ssh/base/action/BaseAction.java
index 508a9f9d..8a427078 100644
--- a/project/easyee-ssh/src/main/java/cn/easyproject/easyee/ssh/base/action/BaseAction.java
+++ b/project/easyee-ssh/src/main/java/cn/easyproject/easyee/ssh/base/action/BaseAction.java
@@ -249,7 +249,7 @@ public SysUser getLoginUser() {
 				String password=c.getMethod("getPassword").invoke(o).toString();
 				
 				user.setUserId(userId);
-				user.setName(realName);
+				user.setName(name);
 				user.setPassword(password);
 				user.setRealName(realName);
 				user.setStatus(status);
diff --git a/project/easyee-ssh/src/main/java/cn/easyproject/easyee/ssh/base/dao/impl/CommonDAOSpringImpl.java b/project/easyee-ssh/src/main/java/cn/easyproject/easyee/ssh/base/dao/impl/CommonDAOSpringImpl.java
index aa56b3dd..99d78feb 100644
--- a/project/easyee-ssh/src/main/java/cn/easyproject/easyee/ssh/base/dao/impl/CommonDAOSpringImpl.java
+++ b/project/easyee-ssh/src/main/java/cn/easyproject/easyee/ssh/base/dao/impl/CommonDAOSpringImpl.java
@@ -362,7 +362,7 @@ public void findByPage(PageBean pageBean, EasyCriteria easyCriteria) {
 	@Override
 	public void findByPage(PageBean pageBean, List values) {
 		String jpql = pageBean.getAutoQuery();
-
+	
 		Query query = createQuery(entityManager, jpql, false, null, values.toArray());
 		query.setFirstResult(pageBean.getRowStart());
 		query.setMaxResults(pageBean.getRowsPerPage());
diff --git a/project/easyee-ssh/src/main/resources/i18n/messages.properties b/project/easyee-ssh/src/main/resources/i18n/messages.properties
index 84b9f370..67f5a774 100644
--- a/project/easyee-ssh/src/main/resources/i18n/messages.properties
+++ b/project/easyee-ssh/src/main/resources/i18n/messages.properties
@@ -5,11 +5,13 @@ label.add        = Add
 label.cancel     = Cancel
 label.cancelEdit = Cancel Edit
 label.chkbox     = Select
+label.clear      = Clear
 label.delete     = Destory 
 label.edit       = Edit 
 label.info       = \ information
 label.list       = \ List
 label.reset      = Reset
+label.search     = Search
 
 msg.choiceDeleteRow = Please select the row to delete
 msg.choiceEditRow   = Please select the row you want to modify
diff --git a/project/easyee-ssh/src/main/resources/i18n/messages_en.properties b/project/easyee-ssh/src/main/resources/i18n/messages_en.properties
index 84b9f370..67f5a774 100644
--- a/project/easyee-ssh/src/main/resources/i18n/messages_en.properties
+++ b/project/easyee-ssh/src/main/resources/i18n/messages_en.properties
@@ -5,11 +5,13 @@ label.add        = Add
 label.cancel     = Cancel
 label.cancelEdit = Cancel Edit
 label.chkbox     = Select
+label.clear      = Clear
 label.delete     = Destory 
 label.edit       = Edit 
 label.info       = \ information
 label.list       = \ List
 label.reset      = Reset
+label.search     = Search
 
 msg.choiceDeleteRow = Please select the row to delete
 msg.choiceEditRow   = Please select the row you want to modify
diff --git a/project/easyee-ssh/src/main/resources/i18n/messages_zh_CN.properties b/project/easyee-ssh/src/main/resources/i18n/messages_zh_CN.properties
index 22f1f160..e6f666c9 100644
--- a/project/easyee-ssh/src/main/resources/i18n/messages_zh_CN.properties
+++ b/project/easyee-ssh/src/main/resources/i18n/messages_zh_CN.properties
@@ -5,11 +5,13 @@ label.add        = \u6DFB\u52A0
 label.cancel     = \u53D6\u6D88
 label.cancelEdit = \u64A4\u9500\u4FEE\u6539
 label.chkbox     = \u591A\u9009\u6846
+label.clear      = \u6E05\u9664
 label.delete     = \u5220\u9664
 label.edit       = \u4FEE\u6539
 label.info       = \u4FE1\u606F
 label.list       = \u5217\u8868
 label.reset      = \u91CD\u7F6E
+label.search     = \u641C\u7D22
 
 msg.choiceDeleteRow = \u8BF7\u9009\u62E9\u8981\u5220\u9664\u7684\u884C
 msg.choiceEditRow   = \u8BF7\u9009\u62E9\u8981\u4FEE\u6539\u7684\u884C
diff --git a/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp b/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
index e0fe27f1..ef272af4 100644
--- a/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
+++ b/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/hr/Dept.jsp
@@ -84,8 +84,8 @@
 	<form action="" id="DeptSearchForm" onclick="Dept.doSearch()">
 		<span>部门名称:</span> <input name="deptCriteria.dname" id="deptName" class="easyui-textbox" />
 		<span>地址:</span> <input name="deptCriteria.loc" id="deptLoc" class="easyui-textbox" />
-		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()">Clear</a>
+		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()"><s:text name="label.search"></s:text></a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()"><s:text name="label.clear"></s:text></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton" data-options="iconCls:'icon-add',plain:true" onclick="$('#deptDataGrid').edatagrid('addRow')">添加部门</a>
diff --git a/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp b/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
index deea43a2..79c40f91 100644
--- a/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
+++ b/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/hr/Emp.jsp
@@ -183,8 +183,8 @@
 			id="empDeptno" style="width:90px;"
 			data-options="editable:false,panelHeight:'auto'">
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="Emp.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()">Clear</a>
+			onclick="Emp.doSearch()"><s:text name="label.search"></s:text></a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()"><s:text name="label.clear"></s:text></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp b/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
index df7f0918..a8448a60 100644
--- a/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
+++ b/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysLog.jsp
@@ -123,7 +123,7 @@
             }]
             ">
 		<a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysLog.doSearch()">Search</a>
+			onclick="sysLog.doSearch()"><s:text name="label.search"></s:text></a>
 	</div>
 	
 </div>
diff --git a/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp b/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
index 5fa9cb2f..fde44690 100644
--- a/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
+++ b/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysRole.jsp
@@ -174,7 +174,7 @@
 				<option value="0">正常</option>
 				<option value="1">禁用</option>
 			</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-				onclick="sysRole.doSearch()">Search</a>
+				onclick="sysRole.doSearch()"><s:text name="label.search"></s:text></a>
 		</div>
 		<a href="javascript:void(0)" class="easyui-linkbutton"
 			data-options="iconCls:'icon-add',plain:true"
diff --git a/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp b/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
index fa4f7f53..f32e4668 100644
--- a/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
+++ b/project/easyee-ssh/src/main/webapp/WEB-INF/content/main/sys/sysUser.jsp
@@ -204,7 +204,7 @@
 			<option value="0">正常</option>
 			<option value="1">禁用</option>
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysUser.doSearch()">Search</a>
+			onclick="sysUser.doSearch()"><s:text name="label.search"></s:text></a>
 	</div>
 	<shiro:hasPermission name="sysUserAddBtn">
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/hr/Dept.jsp b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/hr/Dept.jsp
index e0fe27f1..ef272af4 100644
--- a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/hr/Dept.jsp
+++ b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/hr/Dept.jsp
@@ -84,8 +84,8 @@
 	<form action="" id="DeptSearchForm" onclick="Dept.doSearch()">
 		<span>部门名称:</span> <input name="deptCriteria.dname" id="deptName" class="easyui-textbox" />
 		<span>地址:</span> <input name="deptCriteria.loc" id="deptLoc" class="easyui-textbox" />
-		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()">Clear</a>
+		<a class="easyui-linkbutton" iconCls="icon-search" plain="true" onclick="Dept.doSearch()"><s:text name="label.search"></s:text></a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Dept.clearAll()"><s:text name="label.clear"></s:text></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton" data-options="iconCls:'icon-add',plain:true" onclick="$('#deptDataGrid').edatagrid('addRow')">添加部门</a>
diff --git a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/hr/Emp.jsp b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/hr/Emp.jsp
index deea43a2..79c40f91 100644
--- a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/hr/Emp.jsp
+++ b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/hr/Emp.jsp
@@ -183,8 +183,8 @@
 			id="empDeptno" style="width:90px;"
 			data-options="editable:false,panelHeight:'auto'">
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="Emp.doSearch()">Search</a>
-		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()">Clear</a>
+			onclick="Emp.doSearch()"><s:text name="label.search"></s:text></a>
+		<a class="easyui-linkbutton" iconCls="icon-clear" plain="true" onclick="Emp.clearAll()"><s:text name="label.clear"></s:text></a>
 	</form>
 	</div>
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysLog.jsp b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysLog.jsp
index df7f0918..a8448a60 100644
--- a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysLog.jsp
+++ b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysLog.jsp
@@ -123,7 +123,7 @@
             }]
             ">
 		<a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysLog.doSearch()">Search</a>
+			onclick="sysLog.doSearch()"><s:text name="label.search"></s:text></a>
 	</div>
 	
 </div>
diff --git a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysRole.jsp b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysRole.jsp
index bb99227e..5f88fd51 100644
--- a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysRole.jsp
+++ b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysRole.jsp
@@ -174,7 +174,7 @@
 				<option value="0">正常</option>
 				<option value="1">禁用</option>
 			</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-				onclick="sysRole.doSearch()">Search</a>
+				onclick="sysRole.doSearch()"><s:text name="label.search"></s:text></a>
 		</div>
 		<a href="javascript:void(0)" class="easyui-linkbutton"
 			data-options="iconCls:'icon-add',plain:true"
diff --git a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysUser.jsp b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysUser.jsp
index fa4f7f53..f32e4668 100644
--- a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysUser.jsp
+++ b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysUser.jsp
@@ -204,7 +204,7 @@
 			<option value="0">正常</option>
 			<option value="1">禁用</option>
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysUser.doSearch()">Search</a>
+			onclick="sysUser.doSearch()"><s:text name="label.search"></s:text></a>
 	</div>
 	<shiro:hasPermission name="sysUserAddBtn">
 	<a href="javascript:void(0)" class="easyui-linkbutton"
diff --git a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysUser_iframe.jsp b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysUser_iframe.jsp
index 9033176b..fe5accbe 100644
--- a/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysUser_iframe.jsp
+++ b/project/easyee-ssh/src/main/webapp/staticresources/WEB-INF/content/main/sys/sysUser_iframe.jsp
@@ -259,7 +259,7 @@
 			<option value="0">正常</option>
 			<option value="1">禁用</option>
 		</select> <a class="easyui-linkbutton" iconCls="icon-search" plain="true"
-			onclick="sysUser.doSearch()">Search</a>
+			onclick="sysUser.doSearch()"><s:text name="label.search"></s:text></a>
 	</div>
 	<shiro:hasPermission name="sysUserAddBtn">
 	<a href="javascript:void(0)" class="easyui-linkbutton"