test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-03 12:29:14 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

releases(发布): 准备beta 2.11.6.5

Browse Source
This commit is contained in:
小吾立 2024-06-17 10:56:37 +08:00
parent 820be14b83
commit c33646fbbb
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/common/src/main/java/org/dromara/jpom/common/i18n/I18nMessageUtil.java
View File

@ -115,6 +115,15 @@ public class I18nMessageUtil {
} }
} }
/**
* 尝试获取语言
*
* @return 语言
*/
public static String tryGetNormalLanguage() {
return normalLanguage(tryGetLanguage());
}
/** /**
* 尝试获取语言 * 尝试获取语言
* *

4
modules/server/src/main/java/org/dromara/jpom/controller/IndexControl.java
View File

@ -286,7 +286,7 @@ public class IndexControl extends BaseServerController {
UserModel userModel = getUserModel(); UserModel userModel = getUserModel();
String workspaceId = nodeService.getCheckUserWorkspace(request); String workspaceId = nodeService.getCheckUserWorkspace(request);
JSONObject config = systemParametersServer.getConfigDefNewInstance(StrUtil.format("menus_config_{}", workspaceId), JSONObject.class); JSONObject config = systemParametersServer.getConfigDefNewInstance(StrUtil.format("menus_config_{}", workspaceId), JSONObject.class);
String language = I18nMessageUtil.tryGetLanguage(); String language = I18nMessageUtil.tryGetNormalLanguage();
// 菜单 // 菜单
InputStream inputStream = ResourceUtil.getStream("classpath:/menus/" + language + "/index.json"); InputStream inputStream = ResourceUtil.getStream("classpath:/menus/" + language + "/index.json");
JSONArray showArray = config.getJSONArray("serverMenuKeys"); JSONArray showArray = config.getJSONArray("serverMenuKeys");
@ -328,7 +328,7 @@ public class IndexControl extends BaseServerController {
@SystemPermission @SystemPermission
public IJsonMessage<List<Object>> systemMenusData(HttpServletRequest request) { public IJsonMessage<List<Object>> systemMenusData(HttpServletRequest request) {
UserModel userModel = getUserModel(); UserModel userModel = getUserModel();
String language = I18nMessageUtil.tryGetLanguage(); String language = I18nMessageUtil.tryGetNormalLanguage();
// 菜单 // 菜单
InputStream inputStream = ResourceUtil.getStream("classpath:/menus/" + language + "/system.json"); InputStream inputStream = ResourceUtil.getStream("classpath:/menus/" + language + "/system.json");
String json = IoUtil.read(inputStream, CharsetUtil.CHARSET_UTF_8); String json = IoUtil.read(inputStream, CharsetUtil.CHARSET_UTF_8);

2
modules/server/src/main/java/org/dromara/jpom/controller/node/NodeUpdateController.java
View File

@ -180,7 +180,7 @@ public class NodeUpdateController extends BaseServerController {
@GetMapping(value = "fast_install.json", produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "fast_install.json", produces = MediaType.APPLICATION_JSON_VALUE)
public IJsonMessage<JSONObject> fastInstall(HttpServletRequest request) { public IJsonMessage<JSONObject> fastInstall(HttpServletRequest request) {
boolean beta = RemoteVersion.betaRelease(); boolean beta = RemoteVersion.betaRelease();
String language = I18nMessageUtil.tryGetLanguage(); String language = I18nMessageUtil.tryGetNormalLanguage();
InputStream inputStream = ResourceUtil.getStream("classpath:/fast-install/" + language + (beta ? "/beta.json" : "/release.json")); InputStream inputStream = ResourceUtil.getStream("classpath:/fast-install/" + language + (beta ? "/beta.json" : "/release.json"));
String json = IoUtil.read(inputStream, CharsetUtil.CHARSET_UTF_8); String json = IoUtil.read(inputStream, CharsetUtil.CHARSET_UTF_8);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();

2
modules/server/src/main/java/org/dromara/jpom/controller/system/WorkspaceController.java
View File

@ -279,7 +279,7 @@ public class WorkspaceController extends BaseServerController {
JSONObject config = systemParametersServer.getConfigDefNewInstance(StrUtil.format("menus_config_{}", workspaceId), JSONObject.class); JSONObject config = systemParametersServer.getConfigDefNewInstance(StrUtil.format("menus_config_{}", workspaceId), JSONObject.class);
//"classpath:/menus/index.json" //"classpath:/menus/index.json"
//"classpath:/menus/node-index.json" //"classpath:/menus/node-index.json"
String language = I18nMessageUtil.tryGetLanguage(); String language = I18nMessageUtil.tryGetNormalLanguage();
config.put("serverMenus", this.readMenusJson("classpath:/menus/" + language + "/index.json")); config.put("serverMenus", this.readMenusJson("classpath:/menus/" + language + "/index.json"));
return JsonMessage.success("", config); return JsonMessage.success("", config);
} }