From 38acf1ae16a6a8fb05db1442913e60eb8db35007 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 29 Jul 2018 21:41:59 +0800 Subject: [PATCH] =?UTF-8?q?Global=E5=A2=9E=E5=8A=A0getConfigToBoolean?= =?UTF-8?q?=E3=80=81getConfigToInteger=E3=80=81getPropertyToBoolean?= =?UTF-8?q?=E3=80=81getPropertyToInteger=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/modules/sys/web/LoginController.java | 5 ++--- modules/core/src/main/resources/views/error/500.html | 2 +- .../views/modules/sys/user/corpAdminForm.html | 2 +- .../views/modules/sys/user/corpAdminList.html | 10 +++++----- .../views/themes/default/modules/sys/sysLogin.html | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java index 7a6c5128..20559ee6 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java @@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import com.jeesite.common.config.Global; -import com.jeesite.common.lang.ObjectUtils; import com.jeesite.common.lang.StringUtils; import com.jeesite.common.shiro.filter.FormAuthenticationFilter; import com.jeesite.common.shiro.realm.BaseAuthorizingRealm; @@ -87,7 +86,7 @@ public class LoginController extends BaseController{ } // 是否显示验证码 - model.addAttribute("isValidCodeLogin", ObjectUtils.toInteger(Global.getConfig("sys.login.failedNumAfterValidCode", "200")) == 0); + model.addAttribute("isValidCodeLogin", Global.getConfigToInteger("sys.login.failedNumAfterValidCode", "200") == 0); //获取当前会话对象 Session session = UserUtils.getSession(); @@ -272,7 +271,7 @@ public class LoginController extends BaseController{ } // 是否允许刷新主页，如果已登录，再次访问主页，则退出原账号。 - if (!ObjectUtils.toBoolean(Global.getConfig("shiro.isAllowRefreshIndex", "true"))){ + if (!Global.getConfigToBoolean("shiro.isAllowRefreshIndex", "true")){ String logined = CookieUtils.getCookie(request, "LOGINED"); if (StringUtils.isBlank(logined) || "false".equals(logined)){ CookieUtils.setCookie(response, "LOGINED", "true"); diff --git a/modules/core/src/main/resources/views/error/500.html b/modules/core/src/main/resources/views/error/500.html index 6c71e129..bb580d7d 100644 --- a/modules/core/src/main/resources/views/error/500.html +++ b/modules/core/src/main/resources/views/error/500.html @@ -47,7 +47,7 @@ else { href="http://jeesite.com">JeeSite ${@Global.getProperty('jeesiteVersion')} -<% if (@ObjectUtils.toBoolean(@Global.getConfig('error.page.printErrorInfo', 'true'))){ %> +<% if (@Global.getConfigToBoolean('error.page.printErrorInfo', 'true')){ %>
${@StringUtils.toHtml(@ExceptionUtils.getStackTraceAsString(ex))}
此异常信息若不想输出，可打开jeesite.yml文件，设置error.page.printErrorInfo=false即可 diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html index 940f56b1..9dd6fc96 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html @@ -15,7 +15,7 @@ <#form:hidden path="userCode"/>
基本信息
-
+
-
+
<#form:input path="corpCode_" maxlength="100" class="form-control width-90"/>
-
+
<#form:input path="corpName_" maxlength="100" class="form-control width-90"/> @@ -69,7 +69,7 @@ $('#dataGrid').dataGrid({ return ''+(val||row.id)+''; }}, {header:'用户昵称', name:'userName', index:'a.user_name', width:200, align:"center"}, - <% if(@ObjectUtils.toBoolean(@Global.getConfig('user.useCorpModel'))){ %> + <% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %> {header:'租户代码', name:'corpCode_', index:'a.corp_code', width:200, align:"center", formatter: function(val, obj, row, act){ return ''+val+''; }}, @@ -93,7 +93,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); } actions.push(' '); - <% if(@ObjectUtils.toBoolean(@Global.getConfig('user.useCorpModel'))){ %> + <% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %> actions.push(' '); <% } %> actions.push(' '); diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html index 5eefbfbe..166d443c 100644 --- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html +++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html @@ -24,7 +24,7 @@ <#form:input type="password" name="password" class="form-control required" data-msg-required="${text('请填写登录密码.')}" placeholder="${text('登录密码')}" autocomplete="off"/>
- <%/*