修复常量的引用方式

4661a453 · fengshuonan · 6f5078ad · 4661a453 · 4661a453 · 4661a453
Commit 4661a453 authored Jun 25, 2019 by fengshuonan
13 changed files
--- a/guns-sys/src/main/java/cn/stylefeng/guns/sys/core/beetl/BeetlConfiguration.java
+++ b/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());
    }
 }
--- a/guns-sys/src/main/webapp/assets/modular/system/user/user.js
+++ b/guns-sys/src/main/webapp/assets/modular/system/user/user.js
@@ -28,11 +28,11 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
            {field: 'userId', hide: true, sort: true, title: '用户id'},
            {field: 'account', align: "center", sort: true, title: '账号'},
            {field: 'name', align: "center", sort: true, title: '姓名'},
-            {field: 'sexName', align: "center", sort: true,  title: '性别'},
+            {field: 'sexName', align: "center", sort: true, title: '性别'},
-            {field: 'roleName', align: "center", sort: true,  title: '角色'},
+            {field: 'roleName', align: "center", sort: true, title: '角色'},
-            {field: 'deptName', align: "center", sort: true,  title: '部门'},
+            {field: 'deptName', align: "center", sort: true, title: '部门'},
-            {field: 'email', align: "center", sort: true,  title: '邮箱',  minWidth: 122},
+            {field: 'email', align: "center", sort: true, title: '邮箱', minWidth: 122},
-            {field: 'phone', align: "center", sort: true,  title: '电话', minWidth: 117},
+            {field: 'phone', align: "center", sort: true, title: '电话', minWidth: 117},
            {field: 'createTime', align: "center", sort: true, title: '创建时间', minWidth: 160},
            {field: 'status', align: "center", sort: true, templet: '#statusTpl', title: '状态'},
            {align: 'center', toolbar: '#tableBar', title: '操作', minWidth: 280}
@@ -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) {

--- a/guns-sys/src/main/webapp/pages/404.html
+++ b/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">

--- a/guns-sys/src/main/webapp/pages/common/_header.html
+++ b/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>

--- a/guns-sys/src/main/webapp/pages/common/tree_dlg.html
+++ b/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>
+    <title>${constants.getSystemName()}</title>
-    <meta name="description" content="${systemName}">
+    <meta name="description" content="${constants.getSystemName()}">
    <meta name="author" content="stylefeng">
    <!--其他插件css-->

--- a/guns-sys/src/main/webapp/pages/index.html
+++ b/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>

--- a/guns-sys/src/main/webapp/pages/login.html
+++ b/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">

--- a/guns-sys/src/main/webapp/pages/modular/frame/console.html
+++ b/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"/>

--- a/guns-sys/src/main/webapp/pages/modular/frame/console2.html
+++ b/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>

--- a/guns-sys/src/main/webapp/pages/modular/frame/welcome.html
+++ b/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>

--- a/guns-sys/src/main/webapp/pages/modular/system/role/role_assign.html
+++ b/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>
+    <title>${constants.getSystemName()}</title>
-    <meta name="description" content="${systemName}">
+    <meta name="description" content="${constants.getSystemName()}">
    <meta name="author" content="stylefeng">
    <link rel="stylesheet" href="${ctxPath}/assets/common/libs/layui/css/layui.css"/>

--- a/guns-sys/src/main/webapp/pages/modular/system/user/user.html
+++ b/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="账号/姓名/手机号"/>

--- a/guns-sys/src/main/webapp/pages/modular/system/user/user_roleassign.html
+++ b/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>
+    <title>${constants.getSystemName()}</title>
-    <meta name="description" content="${systemName}">
+    <meta name="description" content="${constants.getSystemName()}">
    <meta name="author" content="stylefeng">
    <link rel="stylesheet" href="${ctxPath}/assets/common/libs/layui/css/layui.css"/>