From 66a9fc7a0065c4b1f0d488018659da98ee8594e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 13:57:11 +0800
Subject: [PATCH] #国际化i18n
---
src/main/java/com/zy/common/web/AuthController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index a86b971..5410b76 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -8,6 +8,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.common.CodeRes;
+import com.zy.common.i18n.I18nMessageService;
import com.zy.common.entity.Parameter;
import com.zy.common.model.PowerDto;
import com.zy.common.model.enums.HtmlNavIconType;
@@ -50,13 +51,15 @@
private RolePermissionService rolePermissionService;
@Autowired
private LicenseTimer licenseTimer;
+ @Autowired
+ private I18nMessageService i18nMessageService;
@RequestMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
public R loginAction(String mobile, String password){
//楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
if (!licenseTimer.getSystemSupport()){
- return R.parse(CodeRes.SYSTEM_20001);
+ return new R(20001, i18nMessageService.getMessage("response.system.licenseExpired"));
}
if (mobile.equals("super") && password.equals(Cools.md5(superPwd))) {
Map<String, Object> res = new HashMap<>();
@@ -68,13 +71,13 @@
userWrapper.eq("mobile", mobile);
User user = userService.selectOne(userWrapper);
if (Cools.isEmpty(user)){
- return R.parse(CodeRes.USER_10001);
+ return new R(10001, i18nMessageService.getMessage("response.user.notFound"));
}
if (user.getStatus()!=1){
- return R.parse(CodeRes.USER_10002);
+ return new R(10002, i18nMessageService.getMessage("response.user.disabled"));
}
if (!user.getPassword().equals(password)){
- return R.parse(CodeRes.USER_10003);
+ return new R(10003, i18nMessageService.getMessage("response.user.passwordMismatch"));
}
String token = Cools.enToken(System.currentTimeMillis() + mobile, user.getPassword());
userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()).eq("system_type", "WCS"));
@@ -165,6 +168,7 @@
}
}
+ resource.setName(localizeResourceName(resource));
subMenu.add(resource);
iterator.remove();
}
@@ -175,7 +179,7 @@
map.put("menuId", menu.getId());
map.put("menuCode", menu.getCode());
map.put("menuIcon", HtmlNavIconType.get(menu.getCode()));
- map.put("menu", menu.getName());
+ map.put("menu", localizeResourceName(menu));
map.put("subMenu", subMenu);
result.add(map);
}
@@ -191,7 +195,7 @@
for (Resource oneLevel : oneLevels){
List<Map> twoLevelsList = new ArrayList<>();
Map<String, Object> oneLevelMap = new HashMap<>();
- oneLevelMap.put("title", oneLevel.getName());
+ oneLevelMap.put("title", localizeResourceName(oneLevel));
oneLevelMap.put("id", oneLevel.getId());
oneLevelMap.put("spread", true);
oneLevelMap.put("children", twoLevelsList);
@@ -199,7 +203,7 @@
// 浜岀骇
for (Resource twoLevel : twoLevels){
Map<String, Object> twoLevelMap = new HashMap<>();
- twoLevelMap.put("title", twoLevel.getName());
+ twoLevelMap.put("title", localizeResourceName(twoLevel));
twoLevelMap.put("id", twoLevel.getId());
twoLevelMap.put("spread", false);
@@ -209,7 +213,7 @@
List<Resource> threeLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy("sort"));
for (Resource threeLevel : threeLevels){
Map<String, Object> threeLevelMap = new HashMap<>();
- threeLevelMap.put("title", threeLevel.getName());
+ threeLevelMap.put("title", localizeResourceName(threeLevel));
threeLevelMap.put("id", threeLevel.getId());
threeLevelMap.put("checked", false);
threeLevelsList.add(threeLevelMap);
@@ -222,7 +226,7 @@
// 鍔熻兘妯″潡
Map<String, Object> functions = new HashMap<>();
- functions.put("title", "鎸囧畾鍔熻兘");
+ functions.put("title", i18nMessageService.getMessage("permission.function"));
functions.put("id", "function");
functions.put("spread", true);
List<Map> funcs = new ArrayList<>();
@@ -230,7 +234,7 @@
List<Permission> permissions = permissionService.selectList(new EntityWrapper<Permission>().eq("status", 1));
for (Permission permission : permissions) {
Map<String, Object> func = new HashMap<>();
- func.put("title", permission.getName());
+ func.put("title", i18nMessageService.resolvePermissionText(permission.getName(), permission.getAction(), permission.getId()));
func.put("id", permission.getAction());
func.put("spread", true);
funcs.add(func);
@@ -240,6 +244,10 @@
return R.ok(result);
}
+ private String localizeResourceName(Resource resource) {
+ return i18nMessageService.resolveResourceText(resource.getName(), resource.getCode(), resource.getId());
+ }
+
@RequestMapping(value = "/power/{roleId}/auth")
@ManagerAuth
public R get(@PathVariable("roleId") Long roleId) {
--
Gitblit v1.9.1