JavaEE Enterprise Basic Development Platform

New version 4.2.0-RELEASE_bugfixed.2 release! # ushelp/EasyEE-Auto#2 # 搜索按钮添加国际化支持 # 修复 mybaits 用户排序问题 # Search button add i18n support # Fixed mybatis sysuser sort problem
ushelp · Mar 3, 2017 · 5fb1786 · 5fb1786
1 parent e1e29ef
commit 5fb1786
Show file tree

Hide file tree

Showing 51 changed files with 108 additions and 359 deletions.
diff --git a/...oot/src/main/java/cn/easyproject/easyee/sh/base/configuration/MultipartConfiguration.java b/...oot/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
-Original file line number
+Diff line change
@@ Expand Up / @@ -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>
@@ Expand Down @@