From 6c7ebe83bf3845a2919653a43ea2f94d6375f1df Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Tue, 22 Mar 2022 15:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=B3=BB=E7=BB=9F=E4=B8=8EAP?= =?UTF-8?q?P=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/ISystemConfigManager.java | 10 ++- .../login/base/manager/ConfigManager.java | 40 ++++++++++++ .../login/base/pojo/vos/config/ConfigVO.java | 20 ++++++ .../resources/templates/config/update.html | 61 +++++++++++++------ 4 files changed, 113 insertions(+), 18 deletions(-) diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/manager/ISystemConfigManager.java b/basic-interface/src/main/java/ink/wgink/interfaces/manager/ISystemConfigManager.java index c462e2a1..579a5903 100644 --- a/basic-interface/src/main/java/ink/wgink/interfaces/manager/ISystemConfigManager.java +++ b/basic-interface/src/main/java/ink/wgink/interfaces/manager/ISystemConfigManager.java @@ -13,8 +13,16 @@ import java.util.Map; * @Version: 1.0 **/ public interface ISystemConfigManager { - + Map getConfig(); + Map getSystemConfigParams(); + + String getSystemConfigParamsValue(String key); + + Map getAppConfigParams(); + + String getAppConfigParamsValue(String key); + void refreshConfig(); } diff --git a/login-base/src/main/java/ink/wgink/login/base/manager/ConfigManager.java b/login-base/src/main/java/ink/wgink/login/base/manager/ConfigManager.java index e231c1f5..faa3ed59 100644 --- a/login-base/src/main/java/ink/wgink/login/base/manager/ConfigManager.java +++ b/login-base/src/main/java/ink/wgink/login/base/manager/ConfigManager.java @@ -1,9 +1,11 @@ package ink.wgink.login.base.manager; +import com.alibaba.fastjson.JSONObject; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.manager.ISystemConfigManager; import ink.wgink.login.base.dao.config.IConfigDao; import ink.wgink.login.base.pojo.dtos.config.ConfigDTO; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,6 +53,44 @@ public class ConfigManager implements ISystemConfigManager { return config; } + @Override + public Map getSystemConfigParams() { + Map config = getConfig(); + String systemParams = config.get("systemConfigParams"); + if (StringUtils.isBlank(systemParams)) { + return null; + } + return JSONObject.parseObject(systemParams, Map.class); + } + + @Override + public String getSystemConfigParamsValue(String key) { + Map systemParams = getSystemConfigParams(); + if (systemParams == null) { + return null; + } + return systemParams.get(key); + } + + @Override + public Map getAppConfigParams() { + Map config = getConfig(); + String appParams = config.get("appConfigParams"); + if (StringUtils.isBlank(appParams)) { + return null; + } + return JSONObject.parseObject(appParams, Map.class); + } + + @Override + public String getAppConfigParamsValue(String key) { + Map appParams = getAppConfigParams(); + if (appParams == null) { + return null; + } + return appParams.get(key); + } + /** * 刷新配置 */ diff --git a/login-base/src/main/java/ink/wgink/login/base/pojo/vos/config/ConfigVO.java b/login-base/src/main/java/ink/wgink/login/base/pojo/vos/config/ConfigVO.java index c1bc4821..6ec1d49a 100644 --- a/login-base/src/main/java/ink/wgink/login/base/pojo/vos/config/ConfigVO.java +++ b/login-base/src/main/java/ink/wgink/login/base/pojo/vos/config/ConfigVO.java @@ -72,6 +72,10 @@ public class ConfigVO { @ApiModelProperty(name = "menuMode", value = "菜单模式") @CheckEmptyAnnotation(name = "菜单模式", types = {"fixedLeft", "floatLeft"}) private String menuMode; + @ApiModelProperty(name = "systemConfigParams", value = "系统配置参数") + private String systemConfigParams; + @ApiModelProperty(name = "appConfigParams", value = "app配置参数") + private String appConfigParams; public String getPasswordValidity() { return passwordValidity == null ? "" : passwordValidity.trim(); @@ -248,4 +252,20 @@ public class ConfigVO { public void setSystemShortTitle(String systemShortTitle) { this.systemShortTitle = systemShortTitle; } + + public String getSystemConfigParams() { + return systemConfigParams == null ? "" : systemConfigParams.trim(); + } + + public void setSystemConfigParams(String systemConfigParams) { + this.systemConfigParams = systemConfigParams; + } + + public String getAppConfigParams() { + return appConfigParams == null ? "" : appConfigParams.trim(); + } + + public void setAppConfigParams(String appConfigParams) { + this.appConfigParams = appConfigParams; + } } diff --git a/login-base/src/main/resources/templates/config/update.html b/login-base/src/main/resources/templates/config/update.html index 37127456..bb891315 100644 --- a/login-base/src/main/resources/templates/config/update.html +++ b/login-base/src/main/resources/templates/config/update.html @@ -256,7 +256,7 @@ 系统参数配置(参数名唯一且只能是字母、数字与下划线的组合) - @@ -275,7 +275,7 @@ 操作 - + @@ -285,7 +285,7 @@ APP参数配置(参数名唯一且只能是字母、数字与下划线的组合) - @@ -304,7 +304,7 @@ 操作 - + @@ -380,6 +380,8 @@ var photoViewer = new Viewer(document.getElementById('photoShow'), {}); var logoViewer = new Viewer(document.getElementById('logoShow'), {}); var shortLogoViewer = new Viewer(document.getElementById('shortLogoShow'), {}); + var systemConfigParams; + var appConfigParams; // 设置logo图片 function setLogoTemple() { @@ -392,7 +394,7 @@ }); logoViewer.update(); } - + // 设置logo图片 function setShortLogoTemple() { var shortLogoTemple = document.getElementById('shortLogoTemple').innerHTML; @@ -417,7 +419,7 @@ } setLogoTemple(); }); - + // 事件-删除图片 $(document).on('click', '.remove-logo-short-btn', function() { var fileId = this.dataset.id; @@ -450,7 +452,7 @@ } }); }); - + // 事件-上传图片 $(document).on('click', '#selectShortLogo', function() { top.dialog.file({ @@ -516,8 +518,8 @@ }); }); - // 系统参数事件 - function paramsConfigInit(idPrefix, classPrefix, initObj) { + // 系统参数配置 + function ParamsConfigInit(idPrefix, classPrefix, paramsJsonString) { var paramsArray = []; var keyupSetTimeout; @@ -566,11 +568,6 @@ return false; } - function init() { - - } - init(); - $(document).on('keyup', '.'+ classPrefix +'-key', function() { var self = this; var index = this.dataset.index; @@ -615,6 +612,31 @@ paramsArray.splice(index, 1); refreshTr(); }) + + this.init = function() { + if(!paramsJsonString) { + return; + } + var paramsObj = JSON.parse(paramsJsonString); + console.log(paramsObj); + for(var k in paramsObj) { + paramsArray.push({ + key: k, + value: paramsObj[k] + }) + } + refreshTr(); + } + this.getConfigParams = function() { + var obj = {}; + for(var i = 0, item; item = paramsArray[i++];) { + if(!item.key) { + continue; + } + obj[item.key] = item.value; + } + return JSON.stringify(obj); + } }; // 初始化 @@ -640,7 +662,7 @@ uKeyLogin: data.uKeyLogin, scanCodeLogin: data.scanCodeLogin, loginBoxPosition: data.loginBoxPosition, - menuMode: data.menuMode + menuMode: data.menuMode, }); form.render(null, 'dataForm'); if(data.systemLogo) { @@ -655,8 +677,11 @@ photos = data.loginBackgroundImages.split(','); } setBackgroundTemple(); - paramsConfigInit('systemParams', 'system-params', {}); - paramsConfigInit('appParams', 'app-params', {}); + systemConfigParams = new ParamsConfigInit('systemConfigParams', 'system-config-params', data.systemConfigParams); + systemConfigParams.init(); + + appConfigParams = new ParamsConfigInit('appConfigParams', 'app-config-params', data.appConfigParams); + appConfigParams.init(); }, function(code, data) { top.dialog.msg(data.msg); }, function() { @@ -675,6 +700,8 @@ formData.field.loginBackgroundImages = photos.toString(); formData.field.systemLogo = logos.length > 0 ? logos[0] : ''; formData.field.systemShortLogo = shortLogos.length > 0 ? shortLogos[0] : ''; + formData.field.systemConfigParams = systemConfigParams.getConfigParams(); + formData.field.appConfigParams = appConfigParams.getConfigParams(); top.restAjax.put(top.restAjax.path('api/config/updateconfig', []), formData.field, null, function(code, data) { var layerIndex = top.dialog.msg('更新成功', { time: 0,