From bd247198500ccbc5a38141a4f450f47eaf916137 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 8 Aug 2024 15:27:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E7=89=88=E6=9C=AC=E8=BE=83=E4=BD=8E?= =?UTF-8?q?=E6=88=96IE=E6=B5=8F=E8=A7=88=E5=99=A8=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1202742033350656]后端-浏览器版本较低或IE浏览器判断 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1202742033350656 --- .../neatlogic/framework/config/FrameworkTenantConfig.java | 4 ++-- .../module/framework/login/handler/TenantController.java | 4 ++-- 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 e0c817ff6..6f7db9bbb 100644 --- a/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java +++ b/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java @@ -21,8 +21,8 @@ public enum FrameworkTenantConfig implements ITenantConfig{ API_QPS("apiqps", null, "nfc.frameworktenantconfig.apiqps"), DISABLED_MODULEGROUPLIST("diabled.modulegrouplist", null,"nfc.frameworktenantconfig.disabledmodulegrouplist"), MOBILE_FILE_DOWNLOAD_ENABLED("mobile.file.download.enabled", "0","nfc.frameworktenantconfig.mobilefiledownloadenabled"), - MINIMUM_CHROME_BROWSER_VERSION("minimum.chrome.browser.version", "95", "nfc.frameworktenantconfig.minimumchromebrowserversion"), - MINIMUM_FIREFOX_BROWSER_VERSION("minimum.firefox.browser.version", "0", "nfc.frameworktenantconfig.minimumfirefoxbrowserversion"), +// MINIMUM_CHROME_BROWSER_VERSION("minimum.chrome.browser.version", "95", "nfc.frameworktenantconfig.minimumchromebrowserversion"), +// MINIMUM_FIREFOX_BROWSER_VERSION("minimum.firefox.browser.version", "0", "nfc.frameworktenantconfig.minimumfirefoxbrowserversion"), ; 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 af36b643b..2f25672fc 100644 --- a/src/main/java/neatlogic/module/framework/login/handler/TenantController.java +++ b/src/main/java/neatlogic/module/framework/login/handler/TenantController.java @@ -121,9 +121,9 @@ public class TenantController { // 是否允许移动端下载附件 data.put("mobileFileDownloadEnabled", ConfigManager.getConfig(FrameworkTenantConfig.MOBILE_FILE_DOWNLOAD_ENABLED)); // Chrome浏览器最低版本，低于该设置版本会跳转至浏览器版本不兼容页面，默认95 - data.put("minimumChromeBrowserVersion", ConfigManager.getConfig(FrameworkTenantConfig.MINIMUM_CHROME_BROWSER_VERSION)); +// data.put("minimumChromeBrowserVersion", ConfigManager.getConfig(FrameworkTenantConfig.MINIMUM_CHROME_BROWSER_VERSION)); // Firefox浏览器最低版本，低于该设置版本会跳转至浏览器版本不兼容页面，默认0 - data.put("minimumFirefoxBrowserVersion", ConfigManager.getConfig(FrameworkTenantConfig.MINIMUM_FIREFOX_BROWSER_VERSION)); +// data.put("minimumFirefoxBrowserVersion", ConfigManager.getConfig(FrameworkTenantConfig.MINIMUM_FIREFOX_BROWSER_VERSION)); ReturnJson.success(data, response); } catch (Exception e) { logger.error(e.getMessage(), e); -- Gitee From 03969682f45476ba45b7f67274ee143e001b6261 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 8 Aug 2024 18:39:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E7=89=88=E6=9C=AC=E8=BE=83=E4=BD=8E?= =?UTF-8?q?=E6=88=96IE=E6=B5=8F=E8=A7=88=E5=99=A8=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1202742033350656]后端-浏览器版本较低或IE浏览器判断 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1202742033350656 --- .../neatlogic/framework/config/FrameworkTenantConfig.java | 2 -- .../module/framework/login/handler/TenantController.java | 4 ---- 2 files changed, 6 deletions(-) diff --git a/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java b/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java index 6f7db9bbb..9bc80c6d0 100644 --- a/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java +++ b/src/main/java/neatlogic/framework/config/FrameworkTenantConfig.java @@ -21,8 +21,6 @@ public enum FrameworkTenantConfig implements ITenantConfig{ API_QPS("apiqps", null, "nfc.frameworktenantconfig.apiqps"), DISABLED_MODULEGROUPLIST("diabled.modulegrouplist", null,"nfc.frameworktenantconfig.disabledmodulegrouplist"), MOBILE_FILE_DOWNLOAD_ENABLED("mobile.file.download.enabled", "0","nfc.frameworktenantconfig.mobilefiledownloadenabled"), -// MINIMUM_CHROME_BROWSER_VERSION("minimum.chrome.browser.version", "95", "nfc.frameworktenantconfig.minimumchromebrowserversion"), -// MINIMUM_FIREFOX_BROWSER_VERSION("minimum.firefox.browser.version", "0", "nfc.frameworktenantconfig.minimumfirefoxbrowserversion"), ; 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 2f25672fc..d48922e74 100644 --- a/src/main/java/neatlogic/module/framework/login/handler/TenantController.java +++ b/src/main/java/neatlogic/module/framework/login/handler/TenantController.java @@ -120,10 +120,6 @@ public class TenantController { } // 是否允许移动端下载附件 data.put("mobileFileDownloadEnabled", ConfigManager.getConfig(FrameworkTenantConfig.MOBILE_FILE_DOWNLOAD_ENABLED)); - // Chrome浏览器最低版本，低于该设置版本会跳转至浏览器版本不兼容页面，默认95 -// data.put("minimumChromeBrowserVersion", ConfigManager.getConfig(FrameworkTenantConfig.MINIMUM_CHROME_BROWSER_VERSION)); - // Firefox浏览器最低版本，低于该设置版本会跳转至浏览器版本不兼容页面，默认0 -// data.put("minimumFirefoxBrowserVersion", ConfigManager.getConfig(FrameworkTenantConfig.MINIMUM_FIREFOX_BROWSER_VERSION)); ReturnJson.success(data, response); } catch (Exception e) { logger.error(e.getMessage(), e); -- Gitee