diff --git a/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java b/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java index 2eca27c58596d368e636d74a286fb78fae1eaed1..9bc80c6d019068363018d179cd58c2d24e6615a9 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","是否允许移动端下载附件"), + 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 6815f93e30852765cf27420522d147d7d0a60336..d48922e74f0dfb9a179cd8693ac2713a3bc96713 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.ALLOW_MOBILE_DOWNLOAD_FILE.getKey()); - if (configVo != null) { - data.put("allowMobileDownloadFile", configVo.getValue()); - } else { - data.put("allowMobileDownloadFile", FrameworkTenantConfig.ALLOW_MOBILE_DOWNLOAD_FILE.getValue()); - } + data.put("mobileFileDownloadEnabled", ConfigManager.getConfig(FrameworkTenantConfig.MOBILE_FILE_DOWNLOAD_ENABLED)); ReturnJson.success(data, response); } catch (Exception e) { logger.error(e.getMessage(), e);