gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.1.6】修改常量命名问题

pull/25/head
rays 2022-01-07 14:37:30 +08:00
parent 24ff3b0978
commit fdda057120
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java
View File

@ -80,7 +80,7 @@ public interface RuleConstants {
/** /**
* 中文的多语言类型编码 * 中文的多语言类型编码
*/ */
String CHINES_TRAN_LANGUAGE_CODE = "chinese"; String CHINESE_TRAN_LANGUAGE_CODE = "chinese";
/** /**
* 租户数据源标识前缀 * 租户数据源标识前缀

2
kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java
View File

@ -160,7 +160,7 @@ public class LoginUser implements Serializable {
* 默认语种是中文 * 默认语种是中文
*/ */
@ChineseDescription("当前用户语种的标识") @ChineseDescription("当前用户语种的标识")
private String tranLanguageCode = RuleConstants.CHINES_TRAN_LANGUAGE_CODE; private String tranLanguageCode = RuleConstants.CHINESE_TRAN_LANGUAGE_CODE;
/** /**
* 租户的编码 * 租户的编码

2
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java
View File

@ -88,7 +88,7 @@ public class LayuiMenusFactory {
// 如果当前用户时非中文状态，则翻译菜单 // 如果当前用户时非中文状态，则翻译菜单
String tranLanguageCode = LoginContext.me().getLoginUser().getTranLanguageCode(); 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); Map<String, String> tranDictBook = TranslationContext.me().getTranslationDictByLanguage(tranLanguageCode);
String translatedName = tranDictBook.get(TranslationConstants.TRAN_CODE_MENU_PREFIX + appMenu.getMenuCode().toUpperCase()); String translatedName = tranDictBook.get(TranslationConstants.TRAN_CODE_MENU_PREFIX + appMenu.getMenuCode().toUpperCase());
if (StrUtil.isNotBlank(translatedName)) { if (StrUtil.isNotBlank(translatedName)) {

6
kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java
View File

@ -24,25 +24,19 @@
*/ */
package cn.stylefeng.roses.kernel.system.modular.resource.controller; 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.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; 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.ApiResource;
import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; 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.resource.ResourceRequest;
import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; 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.entity.SysResource;
import cn.stylefeng.roses.kernel.system.modular.resource.pojo.ResourceTreeNode; import cn.stylefeng.roses.kernel.system.modular.resource.pojo.ResourceTreeNode;
import cn.stylefeng.roses.kernel.system.modular.resource.service.SysResourceService; 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 org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
/** /**