From fdda057120ffe1b309ae4ee17f32031ab6e5ef21 Mon Sep 17 00:00:00 2001 From: rays <1615175118@qq.com> Date: Fri, 7 Jan 2022 14:37:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=E5=91=BD=E5=90=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/rule/constants/RuleConstants.java | 2 +- .../roses/kernel/auth/api/pojo/login/LoginUser.java | 2 +- .../system/modular/menu/factory/LayuiMenusFactory.java | 2 +- .../modular/resource/controller/ResourceController.java | 6 ------ 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java index 2d0ca47c6..05e1e81de 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java @@ -80,7 +80,7 @@ public interface RuleConstants { /** * 中文的多语言类型编码 */ - String CHINES_TRAN_LANGUAGE_CODE = "chinese"; + String CHINESE_TRAN_LANGUAGE_CODE = "chinese"; /** * 租户数据源标识前缀 diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java index 8ea055393..1a9fbda8a 100644 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java +++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java @@ -160,7 +160,7 @@ public class LoginUser implements Serializable { * 默认语种是中文 */ @ChineseDescription("当前用户语种的标识") - private String tranLanguageCode = RuleConstants.CHINES_TRAN_LANGUAGE_CODE; + private String tranLanguageCode = RuleConstants.CHINESE_TRAN_LANGUAGE_CODE; /** * 租户的编码 diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java index 676efd91d..b60d7ae9e 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java @@ -88,7 +88,7 @@ public class LayuiMenusFactory { // 如果当前用户时非中文状态,则翻译菜单 String tranLanguageCode = LoginContext.me().getLoginUser().getTranLanguageCode(); - if (!RuleConstants.CHINES_TRAN_LANGUAGE_CODE.equals(tranLanguageCode)) { + if (!RuleConstants.CHINESE_TRAN_LANGUAGE_CODE.equals(tranLanguageCode)) { Map<String, String> tranDictBook = TranslationContext.me().getTranslationDictByLanguage(tranLanguageCode); String translatedName = tranDictBook.get(TranslationConstants.TRAN_CODE_MENU_PREFIX + appMenu.getMenuCode().toUpperCase()); if (StrUtil.isNotBlank(translatedName)) { diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java index b27a775a8..3344648b0 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java @@ -24,25 +24,19 @@ */ package cn.stylefeng.roses.kernel.system.modular.resource.controller; -import cn.hutool.core.codec.Base64Decoder; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; -import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; -import cn.stylefeng.roses.kernel.system.api.pojo.resource.ExternalResourceRequest; import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource; import cn.stylefeng.roses.kernel.system.modular.resource.pojo.ResourceTreeNode; import cn.stylefeng.roses.kernel.system.modular.resource.service.SysResourceService; -import com.alibaba.fastjson.JSON; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.nio.charset.StandardCharsets; import java.util.List; /**