Skip to content

G
guns-vip
Commit 4661a453 by fengshuonan
Options

修复常量的引用方式

parent 6f5078ad
Showing with 18 additions and 22 deletions
guns-sys/src/main/java/cn/stylefeng/guns/sys/core/beetl/BeetlConfiguration.java
......@@ -34,15 +34,10 @@ public class BeetlConfiguration extends BeetlGroupUtilConfiguration {
@Override
public void initOther() {
//全局共享变量
Map<String, Object> shared = new HashMap<>();
shared.put("systemName", ConstantsContext.getSystemName());
shared.put("welcomeTip", "欢迎使用" + ConstantsContext.getSystemName());
groupTemplate.setSharedVars(shared);
//全局共享方法
groupTemplate.registerFunctionPackage("shiro", new ShiroExt());
groupTemplate.registerFunctionPackage("tool", new ToolUtil());
groupTemplate.registerFunctionPackage("kaptcha", new KaptchaUtil());
groupTemplate.registerFunctionPackage("constants", new ConstantsContext());
}
}
guns-sys/src/main/webapp/assets/modular/system/user/user.js
......@@ -93,7 +93,7 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
* @param data 点击按钮时候的行数据
*/
MgrUser.onEditUser = function (data) {
window.location.href = Feng.ctxPath + "/mgr/user_edit?userId="+ data.userId;
window.location.href = Feng.ctxPath + "/mgr/user_edit?userId=" + data.userId;
};
/**
......@@ -138,7 +138,7 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
* @param data 点击按钮时候的行数据
*/
MgrUser.resetPassword = function (data) {
Feng.confirm("是否重置密码为111111 ?", function () {
Feng.confirm("是否重置密码为" + $("#defaultPassword").val() + "?", function () {
var ajax = new $ax(Feng.ctxPath + "/mgr/reset", function (data) {
Feng.success("重置密码成功!");
}, function (data) {
......
guns-sys/src/main/webapp/pages/404.html
......@@ -2,7 +2,7 @@
<html>
<head>
<title>${systemName}</title>
<title>${constants.getSystemName()}</title>
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
......
guns-sys/src/main/webapp/pages/common/_header.html
......@@ -3,7 +3,7 @@
<div class="layui-logo">
<!--<img src="${ctxPath}/assets/common/images/logo.png"/>-->
<i class="layui-icon layui-icon-component"></i>
<cite>&nbsp;${systemName}&emsp;</cite>
<cite>&nbsp;${constants.getSystemName()}&emsp;</cite>
</div>
<ul class="layui-nav layui-layout-left">
<li class="layui-nav-item" lay-unselect>
......
guns-sys/src/main/webapp/pages/common/tree_dlg.html
......@@ -12,8 +12,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>${systemName}</title>
<meta name="description" content="${systemName}">
<title>${constants.getSystemName()}</title>
<meta name="description" content="${constants.getSystemName()}">
<meta name="author" content="stylefeng">
<!--其他插件css-->
......
guns-sys/src/main/webapp/pages/index.html
......@@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link href="${ctxPath}/assets/expand/images/favicon.ico" rel="icon">
<title>${systemName}</title>
<title>${constants.getSystemName()}</title>
<link rel="stylesheet" href="${ctxPath}/assets/common/libs/layui/css/layui.css"/>
<link rel="stylesheet" href="${ctxPath}/assets/common/module/admin.css"/>
</head>
......
guns-sys/src/main/webapp/pages/login.html
......@@ -43,7 +43,7 @@
<div class="login-wrapper">
<div class="login-header">
<img src="${ctxPath}/assets/expand/images/logo.png"> ${systemName}
<img src="${ctxPath}/assets/expand/images/logo.png"> ${constants.getSystemName()}
</div>
<div class=" login-body">
......
guns-sys/src/main/webapp/pages/modular/frame/console.html
......@@ -4,7 +4,7 @@
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>${systemName}</title>
<title>${constants.getSystemName()}</title>
<link rel="stylesheet" href="${ctxPath}/assets/common/libs/layui/css/layui.css"/>
<link rel="stylesheet" href="${ctxPath}/assets/common/module/admin.css?v=311"/>
<link rel="stylesheet" href="${ctxPath}/assets/expand/css/style.css" media="all"/>
......
guns-sys/src/main/webapp/pages/modular/frame/console2.html
......@@ -5,7 +5,7 @@
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>${systemName}</title>
<title>${constants.getSystemName()}</title>
<link rel="stylesheet" href="${ctxPath}/assets/common/libs/layui/css/layui.css"/>
<link rel="stylesheet" href="${ctxPath}/assets/common/module/admin.css?v=311"/>
<style>
......
guns-sys/src/main/webapp/pages/modular/frame/welcome.html
......@@ -2,7 +2,7 @@
<html>
<head>
<title>${systemName}</title>
<title>${constants.getSystemName()}</title>
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
......@@ -20,7 +20,7 @@
</div>
<div class="layui-card-body" style="text-align: center;">
<h2 style="margin-top: 170px;margin-bottom: 20px;font-size: 28px;color: #91ADDC;">${welcomeTip}</h2>
<h2 style="margin-top: 170px;margin-bottom: 20px;font-size: 28px;color: #91ADDC;">欢迎使用${constants.getSystemName()}</h2>
<img src="${ctxPath}/assets/common/images/welcome.png" style="max-width: 100%;">
</div>
......
guns-sys/src/main/webapp/pages/modular/system/role/role_assign.html
......@@ -5,8 +5,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>${systemName}</title>
<meta name="description" content="${systemName}">
<title>${constants.getSystemName()}</title>
<meta name="description" content="${constants.getSystemName()}">
<meta name="author" content="stylefeng">
<link rel="stylesheet" href="${ctxPath}/assets/common/libs/layui/css/layui.css"/>
......
guns-sys/src/main/webapp/pages/modular/system/user/user.html
......@@ -17,6 +17,7 @@
<div class="layui-card">
<div class="layui-card-body">
<div class="layui-form toolbar">
<input id="defaultPassword" class="layui-input" type="hidden" value="${constants.getDefaultPassword()}"/>
<div class="layui-form-item">
<div class="layui-inline">
<input id="name" class="layui-input" type="text" placeholder="账号/姓名/手机号"/>
......
guns-sys/src/main/webapp/pages/modular/system/user/user_roleassign.html
......@@ -5,8 +5,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>${systemName}</title>
<meta name="description" content="${systemName}">
<title>${constants.getSystemName()}</title>
<meta name="description" content="${constants.getSystemName()}">
<meta name="author" content="stylefeng">
<link rel="stylesheet" href="${ctxPath}/assets/common/libs/layui/css/layui.css"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment