整理所有图片地址

a67fd4c6 · fengshuonan · d80ee3da · a67fd4c6 · a67fd4c6 · a67fd4c6
Commit a67fd4c6 authored Oct 30, 2018 by fengshuonan
7 changed files
--- a/src/main/java/cn/stylefeng/guns/core/beetl/BeetlConfiguration.java
+++ b/src/main/java/cn/stylefeng/guns/core/beetl/BeetlConfiguration.java
@@ -16,6 +16,7 @@
 package cn.stylefeng.guns.core.beetl;
 import cn.stylefeng.guns.core.tag.DictSelectorTag;
+import cn.stylefeng.guns.core.util.DefaultImages;
 import cn.stylefeng.guns.core.util.KaptchaUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import org.beetl.core.Context;
@@ -43,6 +44,8 @@ public class BeetlConfiguration extends BeetlGroupUtilConfiguration {
    @Override
    public void initOther() {
+        groupTemplate.registerFunctionPackage("images", new DefaultImages());
        groupTemplate.registerFunctionPackage("shiro", new ShiroExt());
        groupTemplate.registerFunctionPackage("tool", new ToolUtil());
        groupTemplate.registerFunctionPackage("kaptcha", new KaptchaUtil());

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/DatasourceEnum.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/DatasourceEnum.java
@@ -23,7 +23,14 @@ package cn.stylefeng.guns.core.common.constant;
 */
 public interface DatasourceEnum {
-    String DATA_SOURCE_GUNS = "dataSourceGuns";            //guns数据源
+    /**
+     * guns数据源
+     */
+    String DATA_SOURCE_GUNS = "dataSourceGuns";
+    /**
+     * 其他业务的数据源（第二个数据库）
+     */
+    String DATA_SOURCE_BIZ = "dataSourceBiz";
-    String DATA_SOURCE_BIZ = "dataSourceBiz";            //其他业务的数据源
 }
--- a/src/main/java/cn/stylefeng/guns/core/interceptor/AttributeSetInteceptor.java
+++ b/src/main/java/cn/stylefeng/guns/core/interceptor/AttributeSetInteceptor.java
@@ -15,9 +15,9 @@
 */
 package cn.stylefeng.guns.core.interceptor;
-import cn.stylefeng.guns.core.listener.ConfigListener;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroUser;
+import cn.stylefeng.guns.core.util.DefaultImages;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import org.apache.shiro.authc.AuthenticationException;
 import org.springframework.web.servlet.ModelAndView;
@@ -57,7 +57,7 @@ public class AttributeSetInteceptor extends HandlerInterceptorAdapter {
            modelAndView.addObject("name", user.getName());
            if (ToolUtil.isEmpty(user.getAvatar())) {
-                modelAndView.addObject("avatar", ConfigListener.getConf().get("contextPath") + "/assets/images/users/1.jpg");
+                modelAndView.addObject("avatar", DefaultImages.userAvatar());
            } else {
                modelAndView.addObject("avatar", user.getAvatar());
            }

--- a/src/main/java/cn/stylefeng/guns/core/util/DefaultImages.java
+++ b/src/main/java/cn/stylefeng/guns/core/util/DefaultImages.java
+package cn.stylefeng.guns.core.util;
+import cn.stylefeng.guns.core.listener.ConfigListener;
+/**
+ * 获取默认图片地址
+ *
+ * @author fengshuonan
+ * @date 2018-10-30-5:50 PM
+ */
+public class DefaultImages {
+    /**
+     * 默认的登录页面背景
+     *
+     * @author fengshuonan
+     * @Date 2018/10/30 5:51 PM
+     */
+    public static String loginBg() {
+        return ConfigListener.getConf().get("contextPath") + "/assets/images/login-register.jpg";
+    }
+    /**
+     * 默认的用户图片地址
+     *
+     * @author fengshuonan
+     * @Date 2018/10/30 5:51 PM
+     */
+    public static String userAvatar() {
+        return ConfigListener.getConf().get("contextPath") + "/assets/images/users/1.jpg";
+    }
+    /**
+     * 默认的404错误页面背景
+     *
+     * @author fengshuonan
+     * @Date 2018/10/30 5:51 PM
+     */
+    public static String error404() {
+        return ConfigListener.getConf().get("contextPath") + "/assets/images/error-bg.jpg";
+    }
+}
--- a/src/main/webapp/WEB-INF/404.html
+++ b/src/main/webapp/WEB-INF/404.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="icon" type="image/png" sizes="16x16" href="${ctxPath}/assets/favicon.png">
+    <title> 404 - Guns</title>
+    <link href="${ctxPath}/assets/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="${ctxPath}/assets/static/css/style.css" rel="stylesheet">
+    <link href="${ctxPath}/assets/static/css/colors/blue.css" id="theme" rel="stylesheet">
+</head>
+<body class="fix-header card-no-border">
+<section id="wrapper" class="error-page">
+    @var bgImg = images.error404();
+    <div class="error-box" style="background-image:url(${bgImg});">
+        <div class="error-body text-center">
+            <h1>404</h1>
+            <h3 class="text-uppercase">Page Not Found !</h3>
+            <p class="text-muted m-t-30 m-b-30">YOU SEEM TO BE TRYING TO FIND HIS WAY HOME</p>
+            <a href="${ctxPath}/" class="btn btn-info btn-rounded waves-effect waves-light m-b-40">Back to home</a></div>
+        <footer class="footer text-center">
+            © 2018 Guns by stylefeng （https://gitee.com/stylefeng/guns）
+        </footer>
+    </div>
+</section>
+<script src="${ctxPath}/assets/plugins/jquery/jquery.min.js"></script>
+<script src="${ctxPath}/assets/plugins/bootstrap/js/tether.min.js"></script>
+<script src="${ctxPath}/assets/plugins/bootstrap/js/bootstrap.min.js"></script>
+<script src="${ctxPath}/assets/static/js/waves.js"></script>
+</body>
+</html>
--- a/src/main/webapp/WEB-INF/common/_top_header.html
+++ b/src/main/webapp/WEB-INF/common/_top_header.html
@@ -7,9 +7,7 @@
                <b>
                    <i class=" wi wi-solar-eclipse"></i>
                </b>
-                <span>
+                <span>Guns管理系统</span>
-                        Guns管理系统
-                    </span>
            </a>
        </div>
@@ -70,7 +68,7 @@
                </li>
                <li class="nav-item dropdown">
                    <a class="nav-link dropdown-toggle text-muted waves-effect waves-dark" href="" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i
-                            class="flag-icon flag-icon-us"></i></a>
+                            class="flag-icon flag-icon-cn"></i></a>
                    <div class="dropdown-menu  dropdown-menu-right animated bounceInDown">
                        <a class="dropdown-item" href="#"><i class="flag-icon flag-icon-cn"></i> Chinese</a>
                        <a class="dropdown-item" href="#"><i class="flag-icon flag-icon-us"></i> English</a>

--- a/src/main/webapp/WEB-INF/login.html
+++ b/src/main/webapp/WEB-INF/login.html
@@ -21,7 +21,8 @@
 </div>
 <section id="wrapper">
-    <div class="login-register" style="background-image:url(../assets/images/login-register.jpg);">
+    @var bgImg = images.loginBg();
+    <div class="login-register" style="background-image:url(${bgImg});">
        <div class="login-box card">
            <div class="card-block">
                <form class="form-horizontal form-material" id="loginform" action="${ctxPath}/login" method="post">
@@ -54,7 +55,7 @@
                    </div>
                    <div class="form-group m-b-0">
                        <div class="col-sm-12 text-center">
-                            <p>没有账号? <a href="#" class="text-info m-l-5"><b>点击注册</b></a></p>
+                        <p>没有账号? <a href="#" class="text-info m-l-5"><b>点击注册</b></a></p>
                        </div>
                    </div>
                </form>