diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index b1d4da75..4531ab9c 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -11,3 +11,4 @@ encoding//src/main/webapp/WEB-INF/tlds/fns.tld=UTF-8 encoding//src/main/webapp/WEB-INF/views/letter/process/errorView.jsp=UTF-8 encoding//src/main/webapp/static/common/jeesite.css=UTF-8 encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/src/main/java/com/nis/domain/SysMenu.java b/src/main/java/com/nis/domain/SysMenu.java index 3609fcce..bf91bcbf 100644 --- a/src/main/java/com/nis/domain/SysMenu.java +++ b/src/main/java/com/nis/domain/SysMenu.java @@ -18,6 +18,8 @@ public class SysMenu extends BaseEntity{ private Long parentId; private String parentIds; + + private String code; private String name; @@ -249,5 +251,13 @@ public class SysMenu extends BaseEntity{ public void setParent(SysMenu parent) { this.parent = parent; } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } } \ No newline at end of file diff --git a/src/main/java/com/nis/web/controller/I18nController.java b/src/main/java/com/nis/web/controller/I18nController.java new file mode 100644 index 00000000..8bfa87e2 --- /dev/null +++ b/src/main/java/com/nis/web/controller/I18nController.java @@ -0,0 +1,62 @@ +package com.nis.web.controller; + +import java.util.Locale; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.i18n.CookieLocaleResolver; + +/** + * 国际化控制器 + */ +@Controller +@RequestMapping("/") +public class I18nController { + + @Autowired + private CookieLocaleResolver resolver; + + /** + * 语言切换 + */ + @RequestMapping("language") + public ModelAndView language(HttpServletRequest request, HttpServletResponse response, String language) { + language = language.toLowerCase(); + if (language == null || language.equals("")) { + return new ModelAndView("redirect:/"); + } else { + if (language.equals("zh_cn")) { + resolver.setLocale(request, response, Locale.CHINA); + } else if (language.equals("en")) { + resolver.setLocale(request, response, Locale.ENGLISH); + } else if(language.equals("ru")){ + Locale locale = new Locale("ru","RU"); + resolver.setLocale(request, response, locale); + } else { + resolver.setLocale(request, response, Locale.ENGLISH); + } + } + + return new ModelAndView("redirect:/"); + } + + /** + * 演示一些消息 + */ + @RequestMapping("something") + public void something() { + } + + /** + * 换页面 + */ + @RequestMapping("welcome") + public void welcome() { + } + +} diff --git a/src/main/java/com/nis/web/dao/SysMenuDao.xml b/src/main/java/com/nis/web/dao/SysMenuDao.xml index 029537a1..f067e00d 100644 --- a/src/main/java/com/nis/web/dao/SysMenuDao.xml +++ b/src/main/java/com/nis/web/dao/SysMenuDao.xml @@ -6,6 +6,7 @@ a.id, a.parent_id AS "parent.id", a.parent_ids, + a.code, a.name, a.href, a.target, @@ -68,6 +69,7 @@ INSERT INTO sys_menu( parent_id, parent_ids, + code, name, href, target, @@ -84,6 +86,7 @@ ) VALUES ( #{parent.id}, #{parentIds}, + #{code}, #{name}, #{href}, #{target}, @@ -104,6 +107,7 @@ UPDATE sys_menu SET parent_id = #{parent.id}, parent_ids = #{parentIds}, + code=#{code}, name = #{name}, href = #{href}, target = #{target}, diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties new file mode 100644 index 00000000..4d29aa9a --- /dev/null +++ b/src/main/resources/messages/message_en.properties @@ -0,0 +1,21 @@ +#menu and button info +funMenu=function menu +sysManage=system management +sysAuthor=system authorization +menuManage=menu management +roleManage=role management +dictManage=dictionary management +basicManage=basic management +areaManage=area management +officeManage=office management +userManage=user management +notify=my notify +help=help +home=home +panel=my panel +userInfo=personal information +updatePwd=update password +show=show +edit=edit +hi=hi +exit=exit \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties new file mode 100644 index 00000000..004f547c --- /dev/null +++ b/src/main/resources/messages/message_ru.properties @@ -0,0 +1,21 @@ +#menu and button info +funMenu=function menu +sysManage=system management +sysAuthor=system authorization +menuManage=menu management +roleManage=role management +dictManage=dictionary management +basicManage=basic management +areaManage=area management +officeManage=office management +userManage=user management +notify=my notify +help=help +home=home +panel=my panel +userInfo=personal information +updatePwd=update password +show=show +edit=edit +hi=hi +exit=exit diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties new file mode 100644 index 00000000..0beefcec --- /dev/null +++ b/src/main/resources/messages/message_zh_CN.properties @@ -0,0 +1,21 @@ +#menu and button info +funMenu=\u529F\u80FD\u83DC\u5355 +sysManage=\u7CFB\u7EDF\u7BA1\u7406 +sysAuthor=\u7CFB\u7EDF\u6388\u6743 +menuManage=\u83DC\u5355\u7BA1\u7406 +roleManage=\u89D2\u8272\u7BA1\u7406 +dictManage=\u5B57\u5178\u7BA1\u7406 +basicManage=\u57FA\u672C\u7BA1\u7406 +areaManage=\u533A\u57DF\u7BA1\u7406 +officeManage=\u673A\u6784\u7BA1\u7406 +userManage=\u7528\u6237\u7BA1\u7406 +notify=\u6211\u7684\u540C\u5FD7 +help=\u5173\u4E8E\u5E2E\u52A9 +home=\u5B98\u65B9\u9996\u9875 +panel=\u6211\u7684\u9762\u677F +userInfo=\u4E2A\u4EBA\u4FE1\u606F +updatePwd=\u4FEE\u6539\u5BC6\u7801 +show=\u67E5\u770B +edit=\u4FEE\u6539 +hi=\u4F60\u597D +exit=\u9000\u51FA \ No newline at end of file diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml index 2e961f65..7b6391e4 100644 --- a/src/main/resources/spring-mvc.xml +++ b/src/main/resources/spring-mvc.xml @@ -262,8 +262,18 @@ - - - + + + + + messages/message + + + + + + + + diff --git a/src/main/webapp/WEB-INF/include/taglib.jsp b/src/main/webapp/WEB-INF/include/taglib.jsp index 453003d4..97c24ad4 100644 --- a/src/main/webapp/WEB-INF/include/taglib.jsp +++ b/src/main/webapp/WEB-INF/include/taglib.jsp @@ -5,5 +5,6 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fns" uri="/WEB-INF/tlds/fns.tld" %> <%@ taglib prefix="sys" tagdir="/WEB-INF/tags/sys" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp index b24f2979..a97ac94f 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp +++ b/src/main/webapp/WEB-INF/views/home.jsp @@ -41,8 +41,8 @@ h3{color:#ffffff;margin:30px 0px 0px 10px;}
  • - -

    ${menu.name }

    + " /> +

    <%-- ${menu.name } --%>
    • @@ -50,8 +50,10 @@ h3{color:#ffffff;margin:30px 0px 0px 10px;}
  • - -

    ${menu.name}

    + " /> +

    <%-- ${menu.name} --%> + +

    • @@ -66,20 +68,20 @@ h3{color:#ffffff;margin:30px 0px 0px 10px;}
    @@ -123,14 +128,20 @@ h3{color:#ffffff;margin:30px 0px 0px 10px;}