job支持指定数据源名称,数据源监控显示数据源名称

This commit is contained in:
thinkgem
2018-07-12 23:37:47 +08:00
parent 378bec08f2
commit 941be6a52e
4 changed files with 147 additions and 8 deletions

View File

@@ -227,14 +227,11 @@ public class LoginController extends BaseController{
return REDIRECT + adminPath + "/login";
}
model.addAttribute("user", user); // 设置当前用户信息
// 登录成功后,验证码计算器清零
BaseAuthorizingRealm.isValidCodeLogin(loginInfo.getId(), loginInfo.getParam("deviceType"), "success");
//获取当前会话对象
Session session = UserUtils.getSession();
// 设置共享SessionId的Cookie值睿思BI使用
// 设置共享SessionId的Cookie值(第三方系统使用
String cookieName = Global.getProperty("session.shareSessionIdCookieName");
if (StringUtils.isNotBlank(cookieName)){
CookieUtils.setCookie((HttpServletResponse)response, cookieName, (String)session.getId());

View File

@@ -58,8 +58,8 @@
正在验证登录,请稍后...=Verify login, please later...
立即登录=Login
注册账号=Registered account
忘记密码=Forgot password
注册账号=Register
忘记密码=Forget Password
# =========== 主框架页 ===========

View File

@@ -54,9 +54,10 @@
</#form:form>
<div class="row">
<div class="col-xs-12">
<a href="${ctxPath}/account/forgetPwd" class="pull-left">[ ${text('忘记密码')} ]</a>
<% if(@ObjectUtils.toBoolean(@Global.getConfig('user.registerUser'))){ %>
<a href="${ctxPath}/account/registerUser" class="pull-right">${text('注册账号')}</a><% } %>
<a href="${ctxPath}/account/forgetPwd" class="pull-left">${text('忘记密码')}</a>
<a href="${ctxPath}/account/registerUser" class="pull-left ml10">[ ${text('注册账号')} ]</a>
<% } %>
<%
var langTypeList = @DictUtils.getDictList('sys_lang_type');
if (langTypeList.~size > 1){