diff --git a/modules/core/src/main/resources/i18n/core/common/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common/i18n_en.properties
index 884e8765..63512745 100644
--- a/modules/core/src/main/resources/i18n/core/common/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/common/i18n_en.properties
@@ -1,3 +1,4 @@
+
 # =========== 登录登出相关 =========== 
 
 sys.login.notLongIn=No login or login timeout.Please login again, thank you!
diff --git a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties
index 1e5be275..e9013581 100644
--- a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties
@@ -24,6 +24,10 @@
 详细信息=Detail information
 扩展字段=Extension field
 
+更多操作=More
+取消选择=Cancel select
+当前已选择\ {0}\ 项=Select {0} items
+
 # =========== imageclip =========== 
 
 图片裁剪=Image clip
diff --git a/modules/core/src/main/resources/i18n/core/common_view/i18n_ja_JP.properties b/modules/core/src/main/resources/i18n/core/common_view/i18n_ja_JP.properties
index 2d970f44..548bcdd0 100644
--- a/modules/core/src/main/resources/i18n/core/common_view/i18n_ja_JP.properties
+++ b/modules/core/src/main/resources/i18n/core/common_view/i18n_ja_JP.properties
@@ -24,6 +24,10 @@
 详细信息=詳細情報
 扩展字段=拡張項目
 
+更多操作=より多くの操作
+取消选择=選択を取り消す
+当前已选择\ {0}\ 项=現在は {0} が選択
+
 # =========== imageclip ===========
 
 图片裁剪=画像編集
diff --git a/modules/core/src/main/resources/i18n/core/msg/i18n_en.properties b/modules/core/src/main/resources/i18n/core/msg/i18n_en.properties
new file mode 100644
index 00000000..b0758c78
--- /dev/null
+++ b/modules/core/src/main/resources/i18n/core/msg/i18n_en.properties
@@ -0,0 +1,85 @@
+
+# =========== 消息提醒 =========== 
+
+消息=Message
+你有\ {0}\ 条消息=You have {0} messages
+查看全部消息=See All Messages
+查看消息=See message
+系统消息=System message
+您有\ {0}\ 条新消息，由于消息太多，这里为您合并，请点击查看按钮看详情。=You have {0} new message, because there are too many messages, for you merge, click View see details.
+
+# =========== 消息提醒列表 =========== 
+
+未读消息=Unread message
+已读消息=Read message
+
+发送者=The sender
+发送时间=Sending time
+延迟推送=Delay delivery
+
+全部标记为已读=All marked as read
+全部标记已读成功！=All marks read successfully!
+是否要将全部未读信息标记为已读？=Do you want to mark all unread information as read?
+
+# =========== 消息推送管理 =========== 
+
+消息推送=Message push
+已完成消息=Completed message
+未完成消息=Incomplete message
+
+消息类型=Message type
+消息标题=Message title
+消息内容=Message content
+业务主键=Business key
+业务类型=Business type
+接受者信息=Receiver information
+接受者账号=Receiver account 
+接受者姓名=Receiver name
+接受者编码=Receiver code
+发送者信息=Sender message
+发送者编码=Sender code
+发送者姓名=Sender name
+发送时间=Sending time
+合并推送=Merge push
+计划推送时间=Plan push time
+推送状态信息=Push status information
+推送次数=Push status
+推送返回结果码=Push return result code
+推送返回消息编号=Push return message code
+推送返回的内容信息=Push return content
+推送状态=Push status
+推送时间=Push time
+读取状态信息=Read status information
+读取状态=Read status
+读取时间=Read time
+
+删除消息推送成功！=Delete message push successfully!
+
+
+# =========== 消息模板管理 =========== 
+
+消息模板管理=Message template
+新增消息模板=New message template
+编辑消息模板=Edit message template
+删除消息模板=Delete message template
+
+模板类型=Template type
+模板键值=Template key
+模板名称=Template name
+归属模块=Module 
+模板内容=Template content
+模板内容语法格式=Template content syntax format
+
+# =========== 消息相关字典 =========== 
+
+短信=SMS
+邮件=Email
+微信=WeChat
+
+待推送=Wait push
+成功=Success
+失败=Failure
+
+未送达=Undelivered
+已读=Read
+未读=Unread
diff --git a/modules/core/src/main/resources/i18n/core/msg/i18n_ja_JP.properties b/modules/core/src/main/resources/i18n/core/msg/i18n_ja_JP.properties
new file mode 100644
index 00000000..ab37de94
--- /dev/null
+++ b/modules/core/src/main/resources/i18n/core/msg/i18n_ja_JP.properties
@@ -0,0 +1,10 @@
+
+# =========== 消息提醒 ===========
+
+消息=メッセージ
+你有\ {0}\ 条消息=見読 {0} 件メッセージ
+查看全部消息=全部見る
+查看消息=開く
+系统消息=システムメッセージ
+您有\ {0}\ 条新消息，由于消息太多，这里为您合并，请点击查看按钮看详情。=見読メッセージ {0} 件, 省略で表示しているため, クリックで一覧を見る.
+
diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
index 87193d7d..0916fe2c 100644
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
@@ -78,22 +78,12 @@
 在线=Online
 注销=Logout
 
-# =========== 消息提醒 =========== 
-
-消息=Message
-你有=You have
-条消息=messages
-查看全部消息=See All Messages
-查看消息=See message
-系统消息=System message
-您有\ {0}\ 条新消息，由于消息太多，这里为您合并，请点击查看按钮看详情。=You have {0} new message, because there are too many messages, for you merge, click View see details.
-
 # =========== 个人中心 =========== 
 
 修改密保=Security question
 个人信息=User info
 
-修改头像=Change Avatar	
+修改头像=Change avatar	
 
 个性签名=Signature
 上次登录=Last Login
@@ -165,13 +155,14 @@
 权重(排序)=Weight(Sort)
 权重越大排名越靠前，请填写数字。=Weight big, ranking the front, fill Numbers.
 
+员工=Employee
 员工编号=Work No
 员工姓名=Name
 所在岗位=Position
 英文名=English name
 
-附属机构=Auxiliary Office
-附属岗位=Auxiliary Post
+附属机构=Auxiliary office
+附属岗位=Auxiliary post
 
 角色名称=Role name
 角色编码=Role code
@@ -202,7 +193,7 @@
 启用机构''{0}''成功=Enable office ''{0}'' success
 删除机构''{0}''成功=Delete office ''{0}'' success
 
-上级机构=Parent Office
+上级机构=Parent office
 机构名称=Office name
 机构代码=Office code
 机构全称=Office full name
@@ -250,7 +241,7 @@
 确认要删除该岗位吗？=Are you sure want to delete this position?
 
 保存岗位失败，岗位名称''{0}''已存在=Save position failed, position name ''{0}'' already exists
-保存岗位''{0}''成功=Save the position ''{0}'' success
+保存岗位''{0}''成功=Save position ''{0}'' success
 停用岗位''{0}''成功=Disable position ''{0}'' success
 启用岗位''{0}''成功=Enable position ''{0}'' success
 删除岗位''{0}''成功=Delete position ''{0}'' success
@@ -259,3 +250,62 @@
 岗位名称已存在=Position already exists
 岗位编码=Position code
 岗位分类=Position type
+
+# =========== 角色管理 =========== 
+
+权限管理=Rights manage
+角色管理=Role manage
+用户类型=User type
+系统角色=System role
+角色分类=Role category
+数据范围=Data scope
+业务范围=Business scope
+
+角色编码=Role code
+角色名称=Role name
+角色名称已存在=Role name already exists
+角色分类=Role category
+授权功能菜单=Authorization menu
+
+未设置=None
+全部数据=All data
+自定义数据=Custom data
+本部门数据=Current office data
+本公司数据=Current company data
+本部门和本公司数据=Current office and company data
+控制业务范围=Business scope
+
+新增角色=New role
+编辑角色=Edit role
+停用角色=Disable role
+确认要停用该角色吗？=Are you sure you want to disable role?
+启用角色=Enable role
+确认要启用该角色吗？=Are you sure you want to enable role?
+删除角色=Delete role
+确认要删除该角色吗？=Are you sure you want to delete role?
+角色分配功能权限=Role assign function permissions
+授权菜单=Authorization Menu
+角色分配数据权限=Role assign data permissions
+授权数据权限=Authorization data permissions
+数据权限=Data permissions
+分配用户=Assign user 
+角色分配用户=Role assign user
+
+添加用户=Add user
+批量取消=Batch cancel
+请在列表选中要取消角色的用户=Please select the user to cancel the role in the list
+没有选择要授权的用户=There are no users selected to authorize
+取消授权=Cancel authorization
+确认要取消该用户角色吗？=Are you sure you want cancel user role?
+
+越权操作，只有超级管理员才能修改系统数据！=Unauthorized operation, only system user can modify the system data!
+保存失败，只有系统管理员才能保存为系统角色！=Save failed, only system user can save as system role!
+保存角色''{0}''失败，角色名称已存在=Save role ''{0}'' failed. Role name already exists
+保存角色''{0}''成功=Save role ''{0}'' success
+停用角色''{0}''成功=Disable role ''{0}'' success
+启用角色''{0}''成功=Enable role ''{0}'' success
+删除角色''{0}''失败，角色关联了用户=
+删除角色''{0}''成功=Delete role ''{0}'' success
+角色授权数据权限成功=Role authorization data permissions successfully
+角色授权给用户成功=Role authorization to user success
+取消用户角色授权成功=Success in unauthorizing user roles
diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
index 146e20e9..5708c2c8 100644
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
@@ -78,16 +78,6 @@
 在线=ｵﾝﾗｲﾝ
 注销=ﾛｸﾞｱｳﾄ
 
-# =========== 消息提醒 ===========
-
-消息=メッセージ
-你有=見読
-条消息=件メッセージ
-查看全部消息=全部見る
-查看消息=開く
-系统消息=システムメッセージ
-您有\ {0}\ 条新消息，由于消息太多，这里为您合并，请点击查看按钮看详情。=見読メッセージ {0} 件, 省略で表示しているため, クリックで一覧を見る.
-
 # =========== 个人中心 ===========
 
 修改密保=セキュリティ変更
@@ -165,6 +155,7 @@
 权重(排序)=レベル(ソート)
 权重越大排名越靠前，请填写数字。=重要度が大きいほど前に表示します。数字を入力してください.
 
+员工=社員
 员工编号=社員コード
 员工姓名=氏名
 所在岗位=所属職位
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html
index 32c8d3ff..4d5757bf 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html
@@ -150,9 +150,9 @@ function initSelectTag(){
 	$.each(selectData, function(key, value){
 		selectNum ++;
 		html.push('<span class="tag" id="'+key+'_tags-input"><span>'+value.userName+' </span>'
-			+ '<a href="#" onclick="removeSelectTag(\''+key+'\');" title="取消选择">x</a></span>');
+			+ '<a href="#" onclick="removeSelectTag(\''+key+'\');" title="${text("取消选择")}">x</a></span>');
 	});
-	html.unshift('<div class="title">当前已选择<span id="selectNum">'+selectNum+'</span>项：</div>');
+	html.unshift('<div class="title">${text("当前已选择 {0\} 项", "<span id=\"selectNum\">'+selectNum+'</span>")}：</div>');
 	$('#selectData').empty().append(html.join(''));
 }
 function removeSelectTag(key){
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuLang.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuLang.html
index 19860c63..922b7994 100644
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuLang.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuLang.html
@@ -6,7 +6,7 @@
 	<ul class="dropdown-menu">
 		<li class="mt5"></li>
 		<% for(var dict in @DictUtils.getDictList('sys_lang_type')){ %>
-			<li><a href="${ctxPath}/lang/${dict.dictValue}">${dict.dictLabel}</a></li>
+			<li><a href="${ctxPath}/lang/${dict.dictValue}" onclick="location=this.href+'?url='+location.href;return false;">${dict.dictLabel}</a></li>
 		<% } %>
 		<li class="mt10"></li>
 	</ul>
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuMsg.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuMsg.html
index 73dcf099..56a6a132 100644
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuMsg.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuMsg.html
@@ -5,7 +5,7 @@
 		<span class="label label-success" id="msgNum">0</span>
 	</a>
 	<ul class="dropdown-menu">
-		<li class="header">${text('你有')} <span id="msgNum2">0</span> ${text('条消息')}</li>
+		<li class="header">${text('你有 {0\} 条消息', '<span id="msgNum2">0</span>')}</li>
 		<li>
 			<ul class="menu" id="msgList"
 				data-mergeMsgLimit="${@Global.getConfig('sys.msg.mergeMsgLimit', '5')}"
diff --git a/modules/core/src/test/java/application.yml b/modules/core/src/test/java/application.yml
index d1795b04..1d707cbc 100644
--- a/modules/core/src/test/java/application.yml
+++ b/modules/core/src/test/java/application.yml
@@ -21,3 +21,8 @@ jdbc:
 # 日志配置
 logging:
   config: classpath:logback-test.xml
+
+# 消息推送
+msg:
+  enabled: true
+  
\ No newline at end of file