diff --git a/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java b/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java index 745b7e274a..f3a3eae415 100644 --- a/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java +++ b/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java @@ -1,6 +1,5 @@ package io.dataease.commons.constants; - public interface ParamConstants { String getValue(); @@ -50,7 +49,6 @@ public interface ParamConstants { } } - enum Registry implements ParamConstants { URL("registry.url"), REPO("registry.repo"), @@ -89,7 +87,7 @@ public interface ParamConstants { } } - enum MAIL implements ParamConstants{ + enum MAIL implements ParamConstants { SERVER("smtp.host"), PORT("smtp.port"), ACCOUNT("smtp.account"), @@ -111,11 +109,15 @@ public interface ParamConstants { enum BASIC implements ParamConstants { FRONT_TIME_OUT("basic.frontTimeOut"), - MSG_TIME_OUT("basic.msgTimeOut"); + MSG_TIME_OUT("basic.msgTimeOut"), + OPEN_HOME_PAGE("ui.openHomePage"); + private String value; + public String getValue() { return this.value; } + private BASIC(String value) { this.value = value; } diff --git a/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java b/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java index 19df51477f..bd1cf46d52 100644 --- a/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java +++ b/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java @@ -6,11 +6,13 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class BasicInfo implements Serializable{ +public class BasicInfo implements Serializable { @ApiModelProperty("请求超时时间") private String frontTimeOut; @ApiModelProperty("消息保留时间") private String msgTimeOut; - + @ApiModelProperty("显示首页") + private String openHomePage; + } diff --git a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java index 3e5b3925c3..2efb9197d0 100644 --- a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java +++ b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java @@ -41,7 +41,10 @@ public class SystemParameterService { public BasicInfo basicInfo() { List paramList = this.getParamList("basic"); + List homePageList = this.getParamList("ui.openHomePage"); + paramList.addAll(homePageList); BasicInfo result = new BasicInfo(); + result.setOpenHomePage("true"); if (!CollectionUtils.isEmpty(paramList)) { for (SystemParameter param : paramList) { if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.FRONT_TIME_OUT.getValue())) { @@ -50,6 +53,10 @@ public class SystemParameterService { if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.MSG_TIME_OUT.getValue())) { result.setMsgTimeOut(param.getParamValue()); } + if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.OPEN_HOME_PAGE.getValue())) { + boolean open = StringUtils.equals("true", param.getParamValue()); + result.setOpenHomePage(open ? "true" : "false"); + } } } return result; @@ -137,12 +144,13 @@ public class SystemParameterService { return dtoList; } - public void saveUIInfo(Map> request, List bodyFiles) throws IOException { + public void saveUIInfo(Map> request, List bodyFiles) + throws IOException { List parameters = request.get("systemParams"); if (null != bodyFiles) for (MultipartFile multipartFile : bodyFiles) { if (!multipartFile.isEmpty()) { - //防止添加非图片文件 + // 防止添加非图片文件 try (InputStream input = multipartFile.getInputStream()) { try { // It's an image (only BMP, GIF, JPG and PNG are recognized). @@ -154,10 +162,12 @@ public class SystemParameterService { } String multipartFileName = multipartFile.getOriginalFilename(); String[] split = Objects.requireNonNull(multipartFileName).split(","); - parameters.stream().filter(systemParameterDTO -> systemParameterDTO.getParamKey().equalsIgnoreCase(split[1])).forEach(systemParameterDTO -> { - systemParameterDTO.setFileName(split[0]); - systemParameterDTO.setFile(multipartFile); - }); + parameters.stream() + .filter(systemParameterDTO -> systemParameterDTO.getParamKey().equalsIgnoreCase(split[1])) + .forEach(systemParameterDTO -> { + systemParameterDTO.setFileName(split[0]); + systemParameterDTO.setFile(multipartFile); + }); } } for (SystemParameterDTO systemParameter : parameters) { @@ -168,7 +178,8 @@ public class SystemParameterService { } if (file != null) { fileService.deleteFileById(systemParameter.getParamValue()); - FileMetadata fileMetadata = fileService.saveFile(systemParameter.getFile(), systemParameter.getFileName()); + FileMetadata fileMetadata = fileService.saveFile(systemParameter.getFile(), + systemParameter.getFileName()); systemParameter.setParamValue(fileMetadata.getId()); } if (file == null && systemParameter.getFileName() == null) { @@ -181,5 +192,4 @@ public class SystemParameterService { } - } diff --git a/backend/src/main/resources/db/migration/V33__1.9.sql b/backend/src/main/resources/db/migration/V33__1.9.sql index f3b12126df..3f89c8546e 100644 --- a/backend/src/main/resources/db/migration/V33__1.9.sql +++ b/backend/src/main/resources/db/migration/V33__1.9.sql @@ -86,4 +86,4 @@ CREATE TABLE `de_engine` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -INSERT INTO `system_parameter`(`param_key`, `param_value`, `type`, `sort`) VALUES ('ui.mobileBG', NULL, 'file', 0); +INSERT INTO `system_parameter`(`param_key`, `param_value`, `type`, `sort`) VALUES ('ui.mobileBG', NULL, 'file', 14); diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 1222f6d698..515a63644f 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1632,7 +1632,8 @@ export default { themeLight: 'Light', themeDark: 'Dark', themeCustom: 'Custom', - openHomePage: 'Show Home Page' + openHomePage: 'Show Home Page', + mobileBG: 'Mobile Login page BG' }, auth: { @@ -1888,8 +1889,7 @@ export default { cmonth: 'This Month', cquarter: 'This Quarter', cyear: 'This Year', - openHomePage: 'Show Home Page', - mobileBG: 'Mobile BG' + openHomePage: 'Show Home Page' }, dynamic_year: { fix: 'Fixed Year', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 66db858159..1d2826763c 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1643,7 +1643,7 @@ export default { themeCustom: '自定義', openHomePage: '顯示首頁', - mobileBG: '移動端背景' + mobileBG: '移動端登錄頁背景' }, auth: { diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 8907f20014..fc2d222f20 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1651,7 +1651,7 @@ export default { themeDark: '深色', themeCustom: '自定义', openHomePage: '显示首页', - mobileBG: '移动端背景' + mobileBG: '移动端登录页背景' }, auth: { diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue index f29e560d02..f1bf557778 100644 --- a/frontend/src/views/system/SysParam/BasicSetting.vue +++ b/frontend/src/views/system/SysParam/BasicSetting.vue @@ -31,7 +31,16 @@ + + + + + + + + +
{{ $t('commons.edit') }} @@ -103,7 +112,8 @@ export default { save(formInline) { const param = [ { paramKey: 'basic.frontTimeOut', paramValue: this.formInline.frontTimeOut, type: 'text', sort: 1 }, - { paramKey: 'basic.msgTimeOut', paramValue: this.formInline.msgTimeOut, type: 'text', sort: 2 } + { paramKey: 'basic.msgTimeOut', paramValue: this.formInline.msgTimeOut, type: 'text', sort: 2 }, + { paramKey: 'ui.openHomePage', paramValue: this.formInline.openHomePage, type: 'text', sort: 13 } ]