From 5434fc0e6607bb244687a349ff3d18204abad1f0 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 12 Jul 2024 15:54:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=99=84=E4=BB=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1199120830660608]后端-增加配置字段控制移动端附件下载 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1199120830660608 --- .../java/neatlogic/framework/config/FrameworkTenantConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java b/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java index 2eca27c58..4c5e6edfe 100644 --- a/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java +++ b/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java @@ -20,7 +20,7 @@ import neatlogic.framework.util.$; public enum FrameworkTenantConfig implements ITenantConfig{ API_QPS("apiqps", null, "nfc.frameworktenantconfig.apiqps"), DISABLED_MODULEGROUPLIST("diabled.modulegrouplist", null,"nfc.frameworktenantconfig.disabledmodulegrouplist"), - ALLOW_MOBILE_DOWNLOAD_FILE("allowMobileDownloadFile", "0","是否允许移动端下载附件"), + ALLOW_MOBILE_DOWNLOAD_FILE("allow.mobile.download.file", "0","nfc.frameworktenantconfig.allowmobiledownloadfile"), ; String key; -- Gitee From 38c6d1d6740ff00bfe659c74af474ffa8e9bef46 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 12 Jul 2024 16:04:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=99=84=E4=BB=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1199120830660608]后端-增加配置字段控制移动端附件下载 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1199120830660608 --- .../neatlogic/framework/config/FrameworkTenantConfig.java | 2 +- .../module/framework/login/handler/TenantController.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java b/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java index 4c5e6edfe..9bc80c6d0 100644 --- a/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java +++ b/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java @@ -20,7 +20,7 @@ import neatlogic.framework.util.$; public enum FrameworkTenantConfig implements ITenantConfig{ API_QPS("apiqps", null, "nfc.frameworktenantconfig.apiqps"), DISABLED_MODULEGROUPLIST("diabled.modulegrouplist", null,"nfc.frameworktenantconfig.disabledmodulegrouplist"), - ALLOW_MOBILE_DOWNLOAD_FILE("allow.mobile.download.file", "0","nfc.frameworktenantconfig.allowmobiledownloadfile"), + MOBILE_FILE_DOWNLOAD_ENABLED("mobile.file.download.enabled", "0","nfc.frameworktenantconfig.mobilefiledownloadenabled"), ; String key; diff --git a/src/main/java/neatlogic/module/framework/login/handler/TenantController.java b/src/main/java/neatlogic/module/framework/login/handler/TenantController.java index 6815f93e3..4ab473086 100644 --- a/src/main/java/neatlogic/module/framework/login/handler/TenantController.java +++ b/src/main/java/neatlogic/module/framework/login/handler/TenantController.java @@ -122,11 +122,11 @@ public class TenantController { data.put("ssoTicketKey", Config.SSO_TICKET_KEY()); } // 是否允许移动端下载附件 - ConfigVo configVo = configMapper.getConfigByKey(FrameworkTenantConfig.ALLOW_MOBILE_DOWNLOAD_FILE.getKey()); + ConfigVo configVo = configMapper.getConfigByKey(FrameworkTenantConfig.MOBILE_FILE_DOWNLOAD_ENABLED.getKey()); if (configVo != null) { - data.put("allowMobileDownloadFile", configVo.getValue()); + data.put("mobileFileDownloadEnabled", configVo.getValue()); } else { - data.put("allowMobileDownloadFile", FrameworkTenantConfig.ALLOW_MOBILE_DOWNLOAD_FILE.getValue()); + data.put("mobileFileDownloadEnabled", FrameworkTenantConfig.MOBILE_FILE_DOWNLOAD_ENABLED.getValue()); } ReturnJson.success(data, response); } catch (Exception e) { -- Gitee From ae78c6cc89f2acf1517479f4bd40830521792c41 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 12 Jul 2024 16:21:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=99=84=E4=BB=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1199120830660608]后端-增加配置字段控制移动端附件下载 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1199120830660608 --- .../framework/login/handler/TenantController.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/neatlogic/module/framework/login/handler/TenantController.java b/src/main/java/neatlogic/module/framework/login/handler/TenantController.java index 4ab473086..d48922e74 100644 --- a/src/main/java/neatlogic/module/framework/login/handler/TenantController.java +++ b/src/main/java/neatlogic/module/framework/login/handler/TenantController.java @@ -21,10 +21,9 @@ import neatlogic.framework.common.ReturnJson; import neatlogic.framework.common.config.Config; import neatlogic.framework.common.constvalue.ResponseCode; import neatlogic.framework.common.util.TenantUtil; +import neatlogic.framework.config.ConfigManager; import neatlogic.framework.config.FrameworkTenantConfig; -import neatlogic.framework.dao.mapper.ConfigMapper; import neatlogic.framework.dao.mapper.ThemeMapper; -import neatlogic.framework.dto.ConfigVo; import neatlogic.framework.dto.TenantVo; import neatlogic.framework.dto.ThemeVo; import neatlogic.framework.filter.core.ILoginAuthHandler; @@ -57,8 +56,6 @@ public class TenantController { private boolean isLoad = false; @Resource private ThemeMapper themeMapper; - @Resource - private ConfigMapper configMapper; private void getCommercialModule() { Reflections reflections = new Reflections("neatlogic"); @@ -122,12 +119,7 @@ public class TenantController { data.put("ssoTicketKey", Config.SSO_TICKET_KEY()); } // 是否允许移动端下载附件 - ConfigVo configVo = configMapper.getConfigByKey(FrameworkTenantConfig.MOBILE_FILE_DOWNLOAD_ENABLED.getKey()); - if (configVo != null) { - data.put("mobileFileDownloadEnabled", configVo.getValue()); - } else { - data.put("mobileFileDownloadEnabled", FrameworkTenantConfig.MOBILE_FILE_DOWNLOAD_ENABLED.getValue()); - } + data.put("mobileFileDownloadEnabled", ConfigManager.getConfig(FrameworkTenantConfig.MOBILE_FILE_DOWNLOAD_ENABLED)); ReturnJson.success(data, response); } catch (Exception e) { logger.error(e.getMessage(), e); -- Gitee