1.修改后台管理页面

2.修改环境yml

src/main/java/com/YuyeTech/TPlat/controller/BackstageManagerController.java

@@ -15,6 +15,7 @@ import com.YuyeTech.TPlat.utils.ResultVOUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -52,6 +53,9 @@ public class BackstageManagerController {
 
     @Autowired
     private MainInfoService mainInfoService;
+
+    @Value("${spring.profiles}")
+    private String profiles;
     /***
      * 管理员登陆
      * @param map
@@ -113,7 +117,7 @@ public class BackstageManagerController {
         CookieUtil.set(response, CookieConstant.TOKEN, token, expire);
 
         map.put("msg", ResultEnum.LOGIN_SUCCESS.getMessage());
-        map.put("url", "/backstage_user/list");
+        map.put("url", "/backstage_manager/index");
         return new ModelAndView("common/success", map);
     }
 
@@ -173,6 +177,8 @@ public class BackstageManagerController {
                 + request.getRequestURI();
         log.info("后台入口:adminLogin url={}", url);
 
+        //当前环境
+        map.put("profiles",profiles);
         return new ModelAndView("index", map);
     }
 }

src/main/resources/application-dev.yml

@@ -3,8 +3,8 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
-    password: Qwerty9527
-    url: jdbc:mysql://sh-cdb-5of7rcbk.sql.tencentcdb.com:60412/TPlatTest?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&useSSL=false&serverTimezone=GMT%2b8 #&serverTimezone=UTC
+    password: 9ab8fad748dead93
+    url: jdbc:mysql://42.192.165.168:3306/tplattest?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&useSSL=false&serverTimezone=GMT%2b8 #&serverTimezone=UTC
 #    url: jdbc:mysql://sh-cdb-bicdi0n4.sql.tencentcdb.com:60441/TPlat?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&useSSL=false
 
     hikari:

src/main/resources/application.yml

@@ -32,8 +32,8 @@ spring:
   mail:
     #默认smtp服务主机，UTF-8编码
     host: smtp.163.com
-    username: pxmd3d@163.com
-    password: TTEPFLEWSHPNZVHT
+    username: sweetdontcry@163.com
+    password: OUKALCMEBAFSIAVH
     test-connection: true
     properties:
       mail:

src/main/resources/static/css/main-css/theme3.scss

@@ -163,7 +163,7 @@ body{
 }
 
 .page-header {
-    border-color: $t1-card; 
+    border-color: $t1-card;
     .right .nav-pills .nav-link{
         color: $t1-color5;
     }

src/main/resources/static/js/iframe/iframe.js

@@ -2,44 +2,80 @@
 (function ($, window, document, undefined) {
     'use strict';
 
-    var pluginName = 'iframes';
-    var thisElement = '';
-    var height = '500px';//以这种形式出现的iframe,必须设置高度,不能设置100%
+    let pluginName = 'iframes';
+    let tabContainer = '';
+    let frameContainer = '';
+    let height = '700px';//以这种形式出现的iframe,必须设置高度,不能设置100%
     //入口方法
     $.fn[pluginName] = function (options) {
-        var self = $(this);
-        thisElement = self;
+        let self = $(this);
         if (this == null)
             return null;
-        var data = this.data(pluginName);
+        let data = this.data(pluginName);
         if (!data) {
             data = new BaseIframe(this, options);
             self.data(pluginName, data);
         }
         return data;
     };
-
-
-    var BaseIframe = function (element, options) {
+    let BaseIframe = function (element, options) {
         this.$element = $(element);
         this.options = $.extend(true, {}, this.default, options);
+        tabContainer = $('#'+this.options.tabContainer);
+        frameContainer = $('#'+this.options.frameContainer);
+        console.log(this.options,tabContainer,frameContainer);
         this.init();
     }
-
     //默认配置
     BaseIframe.prototype.default = {
         showIndex: 0, //默认显示页索引
-        loadAll: false//true=一次全部加在页面,false=只加在showIndex指定的页面，其他点击时加载，提高响应速度
+        loadAll: false,//true=一次全部加在页面,false=只加在showIndex指定的页面，其他点击时加载，提高响应速度
+        tabContainer: '',
+        frameContainer: ''
     }
-
-    //结构模板
+    // 结构模板参考
+    // <ul class="nav nav-tabs page-header-tab" >
+    //      <li class="nav-item">
+    //          <a class="nav-link active" id="pills-calendar-tab" data-toggle="pill" href="#pills-calendar" role="tab" aria-controls="pills-calendar" aria-selected="false">单人关卡</a>
+    //      </li>
+    //      <li class="nav-item">
+    //          <a class="nav-link" id="pills-timeline-tab" data-toggle="pill" href="#pills-timeline" role="tab" aria-controls="pills-timeline" aria-selected="true">对战关卡</a>
+    //      </li>
+    // </ul>
+    // <div class="row clearfix">
+    //      <div class="col-md-12 ">
+    //          <div class="tab-content" id="pills-tabContent">
+    //              <div class="tab-pane fade show active" id="pills-calendar" role="tabpanel" aria-labelledby="pills-calendar-tab">
+    //                   <div class="card">
+    //                      <div class="card-body">
+    //                      </div>
+    //                   </div>
+    //              </div>
+    //              <div class="tab-pane fade" id="pills-timeline" role="tabpanel" aria-labelledby="pills-timeline-tab">
+    //                  <div class="card">
+    //                      <div class="card-body">
+    //                      </div>
+    //                  </div>
+    //              </div>
+    //          </div>
+    //      </div>
+    // </div>
+    //根据上面列子结构模板
     BaseIframe.prototype.template = {
-        div_tabs: '<div class="row content-tabs"></div>',
-        nav_menuTabs: '<nav class="page-tabs J_menuTabs"></nav>',
-        nav_a: '<a href="javascript:;" class="J_menuTab" data-id="{0}" data-index="{1}" name="{2}">{3}</a>',//这里不能用id,id会追加代码到a标签内
-        div_content: '<div class="page-tabs-content" id="page-tabs"></div>',
-        div_iframe: '<div class="row J_mainContent" id="content-tabs"></div>',
-        iframe: '<iframe class="J_iframe" name="{0}" data-index="{1}" width="100%" height="{2}" src="{3}" frameborder="0" data-id="{4}" seamless style="display: none;"></iframe>',
+        nav_tabs: '<ul class="nav nav-tabs page-header-tab" id="page-tabs"></ul>',
+        nav_item: '<li class="nav-item"></li>',
+        nav_a: '<a href="javascript:;" class="nav-link " data-toggle="pill" role="tab" aria-selected="false" data-id="{0}" data-index="{1}" name="{2}" url="{3}">{2}</a>',//这里不能用id,id会追加代码到a标签内
+        div_content:
+            ' <div class="row clearfix">\n' +
+            '    <div class="col-md-12 ">\n' +
+            '        <div class="tab-content" id="tab-content">\n' +
+            '        </div>\n' +
+            '    </div>\n' +
+            ' </div>',
+        div_iframe: '' +
+            '  <div class="tab-pane fade show active" id="iframe-content" role="tabpanel" aria-labelledby="pills-calendar-tab">\n' +
+            '    </div>\n',
+        iframe: '<iframe data-id="{0}" data-index="{1}"  name="{2}" src="{3}" height="{4}"  width="100%"  frameborder="0"  seamless style="display: none;"></iframe>',
         a_close: '<i class="fa fa-remove" title="关闭" data-id="{0}"></i>'
     }
 
@@ -55,189 +91,190 @@
             //指定为默认值
             this.options.showIndex = this.default.showIndex;
         }
-        if(this.options.height){
+        if (this.options.height) {
             height = this.options.height;
         }
         //清除原来的tab页
-        this.$element.html("");
+        tabContainer.html("");
+        frameContainer.html("");
         this.builder(this.options.data);
     }
 
     //使用模板搭建页面结构
     BaseIframe.prototype.builder = function (data) {
-        var div_tabs = $(this.template.div_tabs);
-        var nav_menuTabs = $(this.template.nav_menuTabs);
-        var div_content = $(this.template.div_content);
-
-        var div_iframe = $(this.template.div_iframe);
-        for (var i = 0; i < data.length; i++) {
+        //生成菜单栏
+        let nav_tabs = $(this.template.nav_tabs);
+        for (let i = 0; i < data.length; i++) {
+            let nav_item = $(this.template.nav_item);
             //nav-tab
-            var nav_a = $(this.template.nav_a.format(data[i].url,i,data[i].id ,data[i].text));
+            let nav_a = $(this.template.nav_a.format(data[i].id, i, data[i].text, data[i].url));
             //如果可关闭,插入关闭图标，并绑定关闭事件
             if (data[i].closeable) {
-                var a_close = $(this.template.a_close.format(data[i].id));
-
+                let a_close = $(this.template.a_close.format(data[i].id));
                 nav_a.append(" ");
                 nav_a.append(a_close);
             }
-
-            div_content.append(nav_a);
-
-
+            nav_item.append(nav_a);
+            nav_tabs.append(nav_item);
         }
-        nav_menuTabs.append(div_content);
-        div_tabs.append(nav_menuTabs);
-        this.$element.append(div_tabs);
-        this.$element.append(div_iframe);
-        this.loadData();
-    }
-
-    /**
-     * 添加Iframe
-     * */
-    BaseIframe.prototype.openIframe = function(dataUrl,menuName,dataIndex){
-        //console.log("openiframe",this);
-        // 获取标识数据
-        var flag = true;
-        if (dataUrl == undefined || $.trim(dataUrl).length == 0)return false;
-        thisElement.find("#content-tabs iframe").each(function(){
-            //console.log('id',$(this).data('id'));
-            //console.log('url',dataUrl);
-            if($(this).data('id') == dataUrl){
-
-                flag = false;
-            }
-        });
-
 
-        if(flag){
-
-            var iframe = $(this.template.iframe.format(menuName,dataIndex,height,dataUrl,dataUrl));
-
-            thisElement.find("#content-tabs").append(iframe);
-        }
-        BaseIframe.prototype.hidden_a(menuName);
-        return false;
+        let div_content = $(this.template.div_content);
+        let div_iframe = $(this.template.div_iframe);
+        div_content.find("#tab-content").append(div_iframe);
+        //标签列表，和标签所显示的内容
+        tabContainer.append(nav_tabs);
+        frameContainer.append(div_content);
+        this.loadData();
     }
-
     /**加载数据*/
     BaseIframe.prototype.loadData = function () {
-        var data = this.options.data;
+        let data = this.options.data;
         //如果是当前页或者配置了一次性全部加载，否则点击tab页时加载
-        for (var i = 0; i < data.length; i++) {
+        for (let i = 0; i < data.length; i++) {
             if (this.options.loadAll || this.options.showIndex == i) {
                 if (data[i].url) {
                     // 添加iframe
-                    var iframe = $(this.template.iframe.format(data[i].id,i,height,data[i].url,data[i].url));
-                    this.$element.find("#content-tabs").append(iframe);
+                    let iframe = $(this.template.iframe.format(data[i].id, i, data[i].text, data[i].url, height));
+                    frameContainer.find("#iframe-content").append(iframe);
                 } else {
                     console.error("id=" + data[i].id + "的iframe页未指定url");
                 }
             }
         }
-        //console.log("this++",this);
-        //console.log("thisdafult++",BaseIframe.prototype.default);
-        if(data.length > 1){
-            this.$element.find("#content-tabs iframe").eq(this.options.showIndex).css("display","inline");
-            this.$element.find('#page-tabs a').eq(this.options.showIndex).addClass('active');
-        }else{
-            this.$element.find("#content-tabs iframe").eq(0).css("display","inline");
-            this.$element.find('#page-tabs a').eq(0).addClass('active');
+        //存在数据时候，设置active
+        if (data.length > 1) {
+            frameContainer.find("#iframe-content iframe").eq(this.options.showIndex).css("display", "inline");
+            tabContainer.find('#page-tabs a').eq(this.options.showIndex).addClass('active');
+            console.log(tabContainer.find('#page-tabs a').eq(this.options.showIndex))
+        } else {
+            frameContainer.find("#iframe-content iframe").eq(0).css("display", "inline");
+            tabContainer.find('#page-tabs a').eq(0).addClass('active');
         }
         //绑定事件
         BaseIframe.prototype.eventses();
-        //$("#content-tabs iframe").css("height",height);
-        //console.log(thisElement.attr('id'));
-        //console.log(thisElement.html());
+    }
+    /**
+     * 添加Iframe
+     * */
+    BaseIframe.prototype.openIframe = function (context) {
+        let {dataId, dataUrl, menuName, dataIndex} = context;
+        // 获取标识数据
+        let flag = true;
+        if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false;
+        frameContainer.find("#iframe-content iframe").each(function () {
+            console.log('id', $(this).data('id'));
+            console.log('url', dataUrl);
+            if ($(this).data('id') == dataId) {
+                flag = false;
+            }
+        });
+        if (flag) {
+            let iframe = $(this.template.iframe.format(dataId, dataIndex, menuName, dataUrl, height,));
+            frameContainer.find("#iframe-content").append(iframe);
+        }
+        BaseIframe.prototype.hidden_a(menuName);
+        return false;
     }
 
+
     /**点击事件*/
     BaseIframe.prototype.eventses = function () {
-        //console.log("thisElement",thisElement);
-        thisElement.find("#page-tabs a i").each(function(){
-            $(this).click(function(){
-                var id = $(this).data('id');
-                //console.log('ad0',id);
+        //关闭按钮
+        tabContainer.find("#page-tabs a i").each(function () {
+            $(this).click(function () {
+                let id = $(this).data('id');
+                console.log('ad0', id);
                 BaseIframe.prototype.remove(id);
             });
         });
-        thisElement.find("#page-tabs a").click(function(){
-            //console.log("点击a: ",this);
-            var dataUrl = $(this).data('id');
-            var menuName = $(this).text();
-            var name = $(this).attr('name');
-            var dataIndex = $(this).data('index');;
-            BaseIframe.prototype.openIframe(dataUrl,name,dataIndex);
+        //切换tab
+        tabContainer.find("#page-tabs a").click(function () {
+            console.log("点击a: ", this);
+            let dataId = $(this).data('id');
+            // var menuName = $(this).text();
+            let menuName = $(this).attr('name');
+            let dataUrl = $(this).attr('url');
+            let dataIndex = $(this).data('index');
+            BaseIframe.prototype.openIframe({
+                dataUrl, menuName, dataIndex, dataId
+            });
         });
 
     }
 
     //新增一个Iframe页
     BaseIframe.prototype.addIframe = function (obj) {
-        var nav_a = $(this.template.nav_a.format(obj.url,$('#page-tabs a').length,obj.id ,obj.text));
+        let _index = $('#page-tabs a').length;
+        let nav_a = $(this.template.nav_a.format(obj.id,_index,obj.text,obj.url));
         //如果可关闭,插入关闭图标，并绑定关闭事件
         if (obj.closeable) {
-            var a_close = $(this.template.a_close.format(obj.id));
-
+            let a_close = $(this.template.a_close.format(obj.id));
             nav_a.append(" ");
             nav_a.append(a_close);
         }
-
-        thisElement.find("#page-tabs").append(nav_a);
-
+        let nav_item = $(this.template.nav_item);
+        nav_item.append(nav_a);
+        tabContainer.find('#page-tabs').append(nav_item);
         BaseIframe.prototype.eventses();
+
+        //自动切换到当前页面
+        BaseIframe.prototype.openIframe({
+            dataUrl:obj.url, menuName:obj.text, dataIndex:_index, dataId:obj.id
+        });
     }
 
     /**隐藏其他的,显示当前*/
-    BaseIframe.prototype.hidden_a = function(obj){
-        thisElement.find('#page-tabs a').each(function(){
+    BaseIframe.prototype.hidden_a = function (obj) {
+        tabContainer.find('#page-tabs a').each(function () {
             $(this).removeClass('active');
         });
-        thisElement.find('#content-tabs iframe').each(function(){
-            $(this).css("display","none");
+        frameContainer.find('#iframe-content iframe').each(function () {
+            $(this).css("display", "none");
         });
-        thisElement.find("iframe[name='"+obj+"']").css("display","inline");
-        thisElement.find("a[name='"+obj+"']").addClass('active');
-        //console.log("height",height);
-        //thisElement.find("#content-tabs iframe").css("height",height);
+        frameContainer.find("iframe[name='" + obj + "']").css("display", "inline");
+        tabContainer.find("a[name='" + obj + "']").addClass('active');
     }
 
     //根据id获取活动也标签名
-    BaseIframe.prototype.find=function (tabId) {
-        return this.$element.find(".nav-tabs li a[href='#" + tabId + "']").text();
+    BaseIframe.prototype.find = function (tabId) {
+        return tabContainer.find(".nav-tabs li a[href='#" + tabId + "']").text();
     }
 
     // 删除活动页
-    BaseIframe.prototype.remove=function (obj) {
-        thisElement.find("#content-tabs iframe[name='"+obj+"']").remove();
-        thisElement.find("#page-tabs a[name='"+obj+"']").remove();
-        thisElement.find('#page-tabs a').eq(0).addClass('active');
-        thisElement.find("#content-tabs iframe").eq(0).css("display","inline");
-        if(thisElement.find('#page-tabs a').length > 0){
-            var a = thisElement.find('#page-tabs a').eq(0);//找到第一个a标签取出数据
-            this.openIframe(a.data('id'),a.attr('name'),a.data('index'));
+    BaseIframe.prototype.remove = function (obj) {
+        frameContainer.find("#iframe-content iframe[data-id='" + obj + "']").remove();
+        tabContainer.find("#page-tabs a[data-id='" + obj + "']").parent().remove();
+        //设置一个显示的元素
+        tabContainer.find('#page-tabs a').eq(0).addClass('active');
+        frameContainer.find("#iframe-content iframe").eq(0).css("display", "inline");
+        if (tabContainer.find('#page-tabs a').length > 0) {
+            let a = tabContainer.find('#page-tabs a').eq(0);//todo 找到第一个a标签取出数据
+            this.openIframe({
+                dataUrl: a.attr('url'), menuName: a.attr('name'), dataIndex: a.data('index'), dataId: a.data('id')
+            });
         }
     }
 
     //根据id设置活动iframe页
-    BaseIframe.prototype.showIframe=function (tabId) {
-        var a = thisElement.find("#page-tabs a[name='" + tabId + "']");//找到a标签
-        //console.log("a标签",a);
-        var dataUrl = a.data('id');
-        var dataIndex = a.data('index');;
-        BaseIframe.prototype.openIframe(dataUrl,tabId,dataIndex);
+    BaseIframe.prototype.showIframe = function (tabId) {
+        let a = tabContainer.find("#page-tabs a[name='" + tabId + "']");//找到a标签
+        console.log("a标签", a);
+        let dataUrl = a.data('id');
+        let dataIndex = a.data('index');
+        BaseIframe.prototype.openIframe(dataUrl, tabId, dataIndex);
     }
 
     //获取当前活动iframe页的ID
-    BaseIframe.prototype.getCurrentIframeId=function () {
-        var id=thisElement.find("#page-tabs .active a").attr("name");
-        console.log('id',id);
+    BaseIframe.prototype.getCurrentIframeId = function () {
+        var id = tabContainer.find("#page-tabs .active a").attr("name");
+        console.log('id', id);
         return id;
     }
 
     String.prototype.format = function () {
         if (arguments.length == 0) return this;
-        for (var s = this, i = 0; i < arguments.length; i++)
+        let s = this;
+        for (let i = 0; i < arguments.length; i++)
             s = s.replace(new RegExp("\\{" + i + "\\}", "g"), arguments[i]);
         return s;
     };

src/main/resources/templates/app/level-copy.ftl

@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<#include "../common/header.ftl">
+<#setting number_format="#">
+<body class="font-opensans  sidebar_dark">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "关卡列表">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+
+        <#--    主要内容content-->
+        <div class="section-body">
+            <div class="container-fluid">
+                <ul class="nav nav-tabs page-header-tab">
+                    <li class="nav-item">
+                        <a class="nav-link active" id="pills-calendar-tab" data-toggle="pill" href="#pills-calendar" role="tab" aria-controls="pills-calendar" aria-selected="false">单人关卡</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" id="pills-timeline-tab" data-toggle="pill" href="#pills-timeline" role="tab" aria-controls="pills-timeline" aria-selected="true">对战关卡</a>
+                    </li>
+                </ul>
+
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <div class="tab-content" id="pills-tabContent">
+                            <div class="tab-pane fade show active" id="pills-calendar" role="tabpanel" aria-labelledby="pills-calendar-tab">
+                                <div class="card">
+                                    <div class="card-body">
+                                        <table class="table table-bordered table-hover">
+                                            <thead>
+                                            <tr>
+                                                <th>
+                                                    关卡id
+                                                </th>
+                                                <th>
+                                                    关卡名
+                                                </th>
+                                                <th>描述</th>
+                                                <th>详情</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+
+                                            <#list list as item>
+                                                <#if item.numberType == 1>
+                                                    <tr>
+                                                        <td>
+                                                            ${item.id}
+                                                        </td>
+                                                        <td>
+                                                            ${item.name}
+                                                        </td>
+                                                        <td>
+                                                            ${item.describe}
+                                                        </td>
+                                                        <td>
+                                                            <a href="${req.contextPath}/backstage_level/detailItem?levelId=${item.id}"
+                                                               class="btn  btn-primary"
+                                                            >详情</a>
+                                                        </td>
+                                                    </tr>
+                                                </#if>
+                                            </#list>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="tab-pane fade" id="pills-timeline" role="tabpanel" aria-labelledby="pills-timeline-tab">
+                                <div class="card">
+                                    <div class="card-body">
+                                        <table class="table table-bordered table-hover">
+                                            <thead>
+                                            <tr>
+                                                <th>
+                                                    关卡id
+                                                </th>
+                                                <th>
+                                                    关卡名
+                                                </th>
+                                                <th>描述</th>
+                                                <th>详情</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+
+                                            <#list list as item>
+                                                <#if item.numberType == 2>
+                                                    <tr>
+                                                        <td>
+                                                            ${item.id}
+                                                        </td>
+                                                        <td>
+                                                            ${item.name}
+                                                        </td>
+                                                        <td>
+                                                            ${item.describe}
+                                                        </td>
+                                                        <td>
+                                                            <a href="${req.contextPath}/backstage_level/detailItem?levelId=${item.id}"
+                                                               class="btn  btn-primary"
+                                                            >详情</a>
+                                                        </td>
+                                                    </tr>
+                                                </#if>
+                                            </#list>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+
+
+                    </div>
+                </div>
+
+            </div>
+
+        </div>
+
+    </div>
+</div>
+
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+</body>
+</html>

src/main/resources/templates/app/level-detail-copy.ftl

@@ -0,0 +1,253 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+    <#include "../common/header.ftl">
+    <!-- some CSS styling changes and overrides -->
+    <link rel="stylesheet" href="../main-plugins/bootstrap-multiselect/bootstrap-multiselect.css">
+    <link rel="stylesheet" href="../main-plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css"/>
+
+    <link href="../main-plugins/bootstrap-fileinput/css/fileinput.min.css" media="all" rel="stylesheet" type="text/css">
+
+
+</head>
+<#--offcanvas-active-->
+<body class="font-opensans sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+
+        <#if levelJump.id??>
+            <#assign title = "修改关卡信息">
+        <#else >
+            <#assign title = "创建新的关卡">
+        </#if>
+
+        <#include "../common/pageTop.ftl">
+
+        <#--主要内容content-->
+        <div class="section-body">
+            <div class="container-fluid">
+                <div class="row clearfix">
+                    <div class="col-md-10">
+                        <div class="card">
+                            <div class="card-body">
+                                <form name="formBasic" id="formBasic" role="form" method="post"
+                                      enctype="multipart/form-data"
+                                      action="">
+
+                                        <div class="form-group">
+                                            <label>关卡名称</label>
+                                            <input name="levelName" type="text" placeholder="输入关卡名称" class="form-control"
+                                                   value="${(levelJump.name)!''}"/>
+                                        </div>
+                                        <div class="form-group">
+                                            <label class="form-label">关卡简介</label>
+                                            <textarea name="levelDescribe" class="form-control" rows="5">${(levelJump.describe)!''}</textarea>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-sm-6 col-md-6">
+                                                <div class="form-group">
+                                                    <label class="form-label">奖励金币</label>
+                                                    <input name="levelRewardGold" type="number" placeholder="输入奖励金币" class="form-control"
+                                                           value="${(levelJump.rewardGold)!''}"/>
+                                                </div>
+                                            </div>
+                                            <div class="col-sm-6 col-md-6">
+                                                <div class="form-group">
+                                                    <label class="form-label">奖励钻石</label>
+                                                    <input name="levelRewardDiamond" type="number" placeholder="输入奖励钻石" class="form-control"
+                                                           value="${(levelJump.rewardDiamond)!''}"/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-sm-6 col-md-6">
+                                                <div class="form-group">
+                                                    <label class="form-label">关卡消耗金币</label>
+                                                    <input name="levelConsumeGold" type="number" placeholder="输入奖励金币" class="form-control"
+                                                           value="${(levelJump.consumeGold)!''}"/>
+                                                </div>
+                                            </div>
+                                            <div class="col-sm-6 col-md-6">
+                                                <div class="form-group">
+                                                    <label class="form-label">关卡消耗钻石</label>
+                                                    <input name="levelConsumeDiamond" type="number" placeholder="输入奖励钻石" class="form-control"
+                                                           value="${(levelJump.consumeDiamond)!''}"/>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="form-group">
+                                            <label class="form-label">奖励荣誉</label>
+                                            <div class="selectgroup selectgroup-pills">
+                                                <#list levelHonor as honor>
+                                                    <label class="selectgroup-item">
+                                                        <input type="radio" name="honor-radio" value="${honor.id}" class="selectgroup-input"
+                                                                <#if (levelJump.rewardHonor)?? && levelJump.rewardHonor == honor.type>
+                                                            checked = ""
+                                                                </#if>>
+                                                        <span class="selectgroup-button">${honor.name}</span>
+                                                    </label>
+                                                </#list>
+
+                                            </div>
+                                        </div>
+                                    <div class="col-sm-6 col-md-6">
+                                        <div class="form-group">
+                                            <label class="form-label">生成标志块总数，就是关卡预制数量</label>
+                                            <input name="levelSignCount" type="number" placeholder="输入标志块总数" class="form-control"
+                                                   value="${(levelJump.signCount)!''}"/>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="form-label">标志块的种类</label>
+                                        <div class="selectgroup selectgroup-pills">
+                                            <#list signTypeMap as signType>
+                                                <label class="selectgroup-item">
+                                                    <input type="radio" name="levelSignType" value="${signType.value}" class="selectgroup-input"
+                                                            <#if (levelJump.signType)?? && levelJump.signType == signType.value>
+                                                                checked = ""
+                                                            </#if>
+                                                           >
+                                                    <span class="selectgroup-button">${signType.name}</span>
+                                                </label>
+                                            </#list>
+
+                                        </div>
+                                    </div>
+
+                                    <div class="row">
+                                        <div class="col-sm-6 col-md-6">
+                                            <div class="form-group">
+                                                <label>通过关卡的条件</label>
+                                                <select name="conditionPassed" class="form-control">
+                                                    <#list levelCondition as conditionPassed>
+                                                        <#if  conditionPassed.type == 1>
+                                                            <option  value="${conditionPassed.id}"
+                                                                    <#if (levelJump.conditionPassed)?? && levelJump.conditionPassed == conditionPassed.limitType>
+                                                                        selected
+                                                                    </#if>
+                                                            >${conditionPassed.explain}
+                                                            </option>
+                                                        </#if>
+                                                    </#list>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="col-sm-6 col-md-6">
+                                            <div class="form-group">
+                                                <label>解锁关卡条件(可多选)</label>
+                                                <br/>
+                                                <div class="form-group multiselect_div">
+                                                    <select id="multiselect-color2" name="multiselectUnlock" class="multiselect multiselect-custom" multiple="multiple">
+                                                        <#list levelCondition as conditionPassed>
+                                                            <#if  conditionPassed.type == 0>
+                                                                <option  value="${conditionPassed.id}"
+                                                                         <#if (unlockList)??>
+                                                                             <#list unlockList as unlock >
+                                                                                 <#if (unlock)?? && unlock == conditionPassed.limitType>
+                                                                                     selected
+                                                                                 </#if>
+                                                                             </#list>
+                                                                         </#if>
+                                                                >${conditionPassed.explain}
+                                                                </option>
+                                                            </#if>
+                                                        </#list>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-6 col-md-6">
+                                        <div class="form-group">
+                                            <label class="form-label">总时间，限时（秒），0-不限时</label>
+                                            <input name="levelLimitTime" type="number" placeholder="输入限时时间" class="form-control"
+                                                   value="${(levelJump.signCount)!'0'}"/>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="form-label">补充说明</label>
+                                        <textarea name="levelDescribe" class="form-control" rows="5">${(levelJump.describe)!''}</textarea>
+                                    </div>
+                                    <div class="form-group">
+                                        <div class="form-label">关卡人数类型</div>
+                                        <div class="custom-controls-stacked">
+                                            <label class="custom-control custom-radio custom-control-inline">
+                                                <input type="radio" class="custom-control-input" name="numberType-radios" value="1"
+                                                        <#if (levelJump.numberType)?? && levelJump.numberType == 1>
+                                                         checked
+                                                        </#if>>
+                                                <span class="custom-control-label">单人</span>
+                                            </label>
+                                            <label class="custom-control custom-radio custom-control-inline">
+                                                <input type="radio" class="custom-control-input" name="numberType-radios" value="2"
+                                                        <#if (levelJump.numberType)?? && levelJump.numberType == 2>
+                                                        checked
+                                                        </#if>>
+                                                <span class="custom-control-label">多人</span>
+                                            </label>
+                                        </div>
+                                    </div>
+                                    <div class="card-footer">
+                                        <button type="submit" class="btn btn-block btn-primary"> <#if levelJump.id??>
+                                                提交修改
+                                            <#else >
+                                                创建关卡
+                                            </#if></button>
+                                    </div>
+                                </form>
+
+                            </div>
+
+
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+<!-- start plugin js file  -->
+<script src="../main-plugins/bootstrap-multiselect/bootstrap-multiselect.js"></script>
+<script src="../main-plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js"></script>
+<script src="../main-plugins/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js"></script>
+<script src="../main-plugins/multi-select/js/jquery.multi-select.js"></script>
+
+<#--<!-- 主要的 fileinput 插件库 5.1.2-->
+<script src="../main-plugins/bootstrap-fileinput/js/fileinput.min.js"></script>
+<script src="../main-plugins/bootstrap-fileinput/js/locales/zh.js"></script>
+
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+<script src="../js/main/form/form-game-detail.js"></script>
+
+
+<!-- the fileinput plugin initialization -->
+<script>
+    <#if levelJump.id??>
+    $("#formBasic").attr("action", "${req.contextPath}/backstage_level/modify");
+    <#else >
+    $("#formBasic").attr("action", "${req.contextPath}/backstage_level/upload");
+    </#if>
+</script>
+</body>
+</html>

src/main/resources/templates/app/level-detail.ftl

@@ -22,123 +22,132 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-
-        <#if levelJump.id??>
-            <#assign title = "修改关卡信息">
-        <#else >
-            <#assign title = "创建新的关卡">
-        </#if>
-
-        <#include "../common/pageTop.ftl">
-
-        <#--主要内容content-->
-        <div class="section-body">
-            <div class="container-fluid">
-                <div class="row clearfix">
-                    <div class="col-md-10">
-                        <div class="card">
-                            <div class="card-body">
-                                <form name="formBasic" id="formBasic" role="form" method="post"
-                                      enctype="multipart/form-data"
-                                      action="">
-
+    <div style="height: 10px;"></div>
+    <#--主要内容content-->
+    <div class="section-body">
+        <div class="container-fluid">
+            <div class="row clearfix">
+                <div class="col-md-10">
+                    <div class="card">
+                        <div class="card-body">
+                            <form name="formBasic" id="formBasic" role="form" method="post"
+                                  enctype="multipart/form-data"
+                                  action="">
+
+                                <div class="form-group">
+                                    <label>关卡名称</label>
+                                    <input name="levelName" type="text" placeholder="输入关卡名称" class="form-control"
+                                           value="${(levelJump.name)!''}"/>
+                                </div>
+                                <div class="form-group">
+                                    <label class="form-label">关卡简介</label>
+                                    <textarea name="levelDescribe" class="form-control" rows="5">${(levelJump.describe)!''}</textarea>
+                                </div>
+                                <div class="row">
+                                    <div class="col-sm-6 col-md-6">
                                         <div class="form-group">
-                                            <label>关卡名称</label>
-                                            <input name="levelName" type="text" placeholder="输入关卡名称" class="form-control"
-                                                   value="${(levelJump.name)!''}"/>
+                                            <label class="form-label">奖励金币</label>
+                                            <input name="levelRewardGold" type="number" placeholder="输入奖励金币" class="form-control"
+                                                   value="${(levelJump.rewardGold)!''}"/>
                                         </div>
+                                    </div>
+                                    <div class="col-sm-6 col-md-6">
                                         <div class="form-group">
-                                            <label class="form-label">关卡简介</label>
-                                            <textarea name="levelDescribe" class="form-control" rows="5">${(levelJump.describe)!''}</textarea>
+                                            <label class="form-label">奖励钻石</label>
+                                            <input name="levelRewardDiamond" type="number" placeholder="输入奖励钻石" class="form-control"
+                                                   value="${(levelJump.rewardDiamond)!''}"/>
                                         </div>
-                                        <div class="row">
-                                            <div class="col-sm-6 col-md-6">
-                                                <div class="form-group">
-                                                    <label class="form-label">奖励金币</label>
-                                                    <input name="levelRewardGold" type="number" placeholder="输入奖励金币" class="form-control"
-                                                           value="${(levelJump.rewardGold)!''}"/>
-                                                </div>
-                                            </div>
-                                            <div class="col-sm-6 col-md-6">
-                                                <div class="form-group">
-                                                    <label class="form-label">奖励钻石</label>
-                                                    <input name="levelRewardDiamond" type="number" placeholder="输入奖励钻石" class="form-control"
-                                                           value="${(levelJump.rewardDiamond)!''}"/>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-sm-6 col-md-6">
-                                                <div class="form-group">
-                                                    <label class="form-label">关卡消耗金币</label>
-                                                    <input name="levelConsumeGold" type="number" placeholder="输入奖励金币" class="form-control"
-                                                           value="${(levelJump.consumeGold)!''}"/>
-                                                </div>
-                                            </div>
-                                            <div class="col-sm-6 col-md-6">
-                                                <div class="form-group">
-                                                    <label class="form-label">关卡消耗钻石</label>
-                                                    <input name="levelConsumeDiamond" type="number" placeholder="输入奖励钻石" class="form-control"
-                                                           value="${(levelJump.consumeDiamond)!''}"/>
-                                                </div>
-                                            </div>
-                                        </div>
-
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-sm-6 col-md-6">
                                         <div class="form-group">
-                                            <label class="form-label">奖励荣誉</label>
-                                            <div class="selectgroup selectgroup-pills">
-                                                <#list levelHonor as honor>
-                                                    <label class="selectgroup-item">
-                                                        <input type="radio" name="honor-radio" value="${honor.id}" class="selectgroup-input"
-                                                                <#if (levelJump.rewardHonor)?? && levelJump.rewardHonor == honor.type>
-                                                            checked = ""
-                                                                </#if>>
-                                                        <span class="selectgroup-button">${honor.name}</span>
-                                                    </label>
-                                                </#list>
-
-                                            </div>
+                                            <label class="form-label">关卡消耗金币</label>
+                                            <input name="levelConsumeGold" type="number" placeholder="输入奖励金币" class="form-control"
+                                                   value="${(levelJump.consumeGold)!''}"/>
                                         </div>
+                                    </div>
                                     <div class="col-sm-6 col-md-6">
                                         <div class="form-group">
-                                            <label class="form-label">生成标志块总数，就是关卡预制数量</label>
-                                            <input name="levelSignCount" type="number" placeholder="输入标志块总数" class="form-control"
-                                                   value="${(levelJump.signCount)!''}"/>
+                                            <label class="form-label">关卡消耗钻石</label>
+                                            <input name="levelConsumeDiamond" type="number" placeholder="输入奖励钻石" class="form-control"
+                                                   value="${(levelJump.consumeDiamond)!''}"/>
                                         </div>
                                     </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label class="form-label">奖励荣誉</label>
+                                    <div class="selectgroup selectgroup-pills">
+                                        <#list levelHonor as honor>
+                                            <label class="selectgroup-item">
+                                                <input type="radio" name="honor-radio" value="${honor.id}" class="selectgroup-input"
+                                                        <#if (levelJump.rewardHonor)?? && levelJump.rewardHonor == honor.type>
+                                                    checked = ""
+                                                        </#if>>
+                                                <span class="selectgroup-button">${honor.name}</span>
+                                            </label>
+                                        </#list>
+
+                                    </div>
+                                </div>
+                                <div class="col-sm-6 col-md-6">
                                     <div class="form-group">
-                                        <label class="form-label">标志块的种类</label>
-                                        <div class="selectgroup selectgroup-pills">
-                                            <#list signTypeMap as signType>
-                                                <label class="selectgroup-item">
-                                                    <input type="radio" name="levelSignType" value="${signType.value}" class="selectgroup-input"
-                                                            <#if (levelJump.signType)?? && levelJump.signType == signType.value>
-                                                                checked = ""
-                                                            </#if>
-                                                           >
-                                                    <span class="selectgroup-button">${signType.name}</span>
-                                                </label>
-                                            </#list>
+                                        <label class="form-label">生成标志块总数，就是关卡预制数量</label>
+                                        <input name="levelSignCount" type="number" placeholder="输入标志块总数" class="form-control"
+                                               value="${(levelJump.signCount)!''}"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="form-label">标志块的种类</label>
+                                    <div class="selectgroup selectgroup-pills">
+                                        <#list signTypeMap as signType>
+                                            <label class="selectgroup-item">
+                                                <input type="radio" name="levelSignType" value="${signType.value}" class="selectgroup-input"
+                                                        <#if (levelJump.signType)?? && levelJump.signType == signType.value>
+                                                            checked = ""
+                                                        </#if>
+                                                >
+                                                <span class="selectgroup-button">${signType.name}</span>
+                                            </label>
+                                        </#list>
 
-                                        </div>
                                     </div>
+                                </div>
 
-                                    <div class="row">
-                                        <div class="col-sm-6 col-md-6">
-                                            <div class="form-group">
-                                                <label>通过关卡的条件</label>
-                                                <select name="conditionPassed" class="form-control">
+                                <div class="row">
+                                    <div class="col-sm-6 col-md-6">
+                                        <div class="form-group">
+                                            <label>通过关卡的条件</label>
+                                            <select name="conditionPassed" class="form-control">
+                                                <#list levelCondition as conditionPassed>
+                                                    <#if  conditionPassed.type == 1>
+                                                        <option  value="${conditionPassed.id}"
+                                                                <#if (levelJump.conditionPassed)?? && levelJump.conditionPassed == conditionPassed.limitType>
+                                                                    selected
+                                                                </#if>
+                                                        >${conditionPassed.explain}
+                                                        </option>
+                                                    </#if>
+                                                </#list>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-6 col-md-6">
+                                        <div class="form-group">
+                                            <label>解锁关卡条件(可多选)</label>
+                                            <br/>
+                                            <div class="form-group multiselect_div">
+                                                <select id="multiselect-color2" name="multiselectUnlock" class="multiselect multiselect-custom" multiple="multiple">
                                                     <#list levelCondition as conditionPassed>
-                                                        <#if  conditionPassed.type == 1>
+                                                        <#if  conditionPassed.type == 0>
                                                             <option  value="${conditionPassed.id}"
-                                                                    <#if (levelJump.conditionPassed)?? && levelJump.conditionPassed == conditionPassed.limitType>
-                                                                        selected
+                                                                    <#if (unlockList)??>
+                                                                        <#list unlockList as unlock >
+                                                                            <#if (unlock)?? && unlock == conditionPassed.limitType>
+                                                                                selected
+                                                                            </#if>
+                                                                        </#list>
                                                                     </#if>
                                                             >${conditionPassed.explain}
                                                             </option>
@@ -147,76 +156,52 @@
                                                 </select>
                                             </div>
                                         </div>
-                                        <div class="col-sm-6 col-md-6">
-                                            <div class="form-group">
-                                                <label>解锁关卡条件(可多选)</label>
-                                                <br/>
-                                                <div class="form-group multiselect_div">
-                                                    <select id="multiselect-color2" name="multiselectUnlock" class="multiselect multiselect-custom" multiple="multiple">
-                                                        <#list levelCondition as conditionPassed>
-                                                            <#if  conditionPassed.type == 0>
-                                                                <option  value="${conditionPassed.id}"
-                                                                         <#if (unlockList)??>
-                                                                             <#list unlockList as unlock >
-                                                                                 <#if (unlock)?? && unlock == conditionPassed.limitType>
-                                                                                     selected
-                                                                                 </#if>
-                                                                             </#list>
-                                                                         </#if>
-                                                                >${conditionPassed.explain}
-                                                                </option>
-                                                            </#if>
-                                                        </#list>
-                                                    </select>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-sm-6 col-md-6">
-                                        <div class="form-group">
-                                            <label class="form-label">总时间，限时（秒），0-不限时</label>
-                                            <input name="levelLimitTime" type="number" placeholder="输入限时时间" class="form-control"
-                                                   value="${(levelJump.signCount)!'0'}"/>
-                                        </div>
                                     </div>
+                                </div>
+                                <div class="col-sm-6 col-md-6">
                                     <div class="form-group">
-                                        <label class="form-label">补充说明</label>
-                                        <textarea name="levelDescribe" class="form-control" rows="5">${(levelJump.describe)!''}</textarea>
+                                        <label class="form-label">总时间，限时（秒），0-不限时</label>
+                                        <input name="levelLimitTime" type="number" placeholder="输入限时时间" class="form-control"
+                                               value="${(levelJump.signCount)!'0'}"/>
                                     </div>
-                                    <div class="form-group">
-                                        <div class="form-label">关卡人数类型</div>
-                                        <div class="custom-controls-stacked">
-                                            <label class="custom-control custom-radio custom-control-inline">
-                                                <input type="radio" class="custom-control-input" name="numberType-radios" value="1"
-                                                        <#if (levelJump.numberType)?? && levelJump.numberType == 1>
-                                                         checked
-                                                        </#if>>
-                                                <span class="custom-control-label">单人</span>
-                                            </label>
-                                            <label class="custom-control custom-radio custom-control-inline">
-                                                <input type="radio" class="custom-control-input" name="numberType-radios" value="2"
-                                                        <#if (levelJump.numberType)?? && levelJump.numberType == 2>
-                                                        checked
-                                                        </#if>>
-                                                <span class="custom-control-label">多人</span>
-                                            </label>
-                                        </div>
-                                    </div>
-                                    <div class="card-footer">
-                                        <button type="submit" class="btn btn-block btn-primary"> <#if levelJump.id??>
-                                                提交修改
-                                            <#else >
-                                                创建关卡
-                                            </#if></button>
+                                </div>
+                                <div class="form-group">
+                                    <label class="form-label">补充说明</label>
+                                    <textarea name="levelDescribe" class="form-control" rows="5">${(levelJump.describe)!''}</textarea>
+                                </div>
+                                <div class="form-group">
+                                    <div class="form-label">关卡人数类型</div>
+                                    <div class="custom-controls-stacked">
+                                        <label class="custom-control custom-radio custom-control-inline">
+                                            <input type="radio" class="custom-control-input" name="numberType-radios" value="1"
+                                                    <#if (levelJump.numberType)?? && levelJump.numberType == 1>
+                                            checked
+                                                    </#if>>
+                                            <span class="custom-control-label">单人</span>
+                                        </label>
+                                        <label class="custom-control custom-radio custom-control-inline">
+                                            <input type="radio" class="custom-control-input" name="numberType-radios" value="2"
+                                                    <#if (levelJump.numberType)?? && levelJump.numberType == 2>
+                                            checked
+                                                    </#if>>
+                                            <span class="custom-control-label">多人</span>
+                                        </label>
                                     </div>
-                                </form>
-
-                            </div>
-
+                                </div>
+                                <div class="card-footer">
+                                    <button type="submit" class="btn btn-block btn-primary"> <#if levelJump.id??>
+                                            提交修改
+                                        <#else >
+                                            创建关卡
+                                        </#if></button>
+                                </div>
+                            </form>
 
                         </div>
 
+
                     </div>
+
                 </div>
             </div>
         </div>

src/main/resources/templates/app/level.ftl

@@ -11,129 +11,120 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "关卡列表">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
+    <div style="height: 10px;"></div>
+    <#--    主要内容content-->
+    <div class="section-body">
+        <div class="container-fluid">
+            <ul class="nav nav-tabs page-header-tab">
+                <li class="nav-item">
+                    <a class="nav-link active" id="pills-calendar-tab" data-toggle="pill" href="#pills-calendar" role="tab" aria-controls="pills-calendar" aria-selected="false">单人关卡</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="pills-timeline-tab" data-toggle="pill" href="#pills-timeline" role="tab" aria-controls="pills-timeline" aria-selected="true">对战关卡</a>
+                </li>
+            </ul>
 
-        <#--    主要内容content-->
-        <div class="section-body">
-            <div class="container-fluid">
-                <ul class="nav nav-tabs page-header-tab">
-                    <li class="nav-item">
-                        <a class="nav-link active" id="pills-calendar-tab" data-toggle="pill" href="#pills-calendar" role="tab" aria-controls="pills-calendar" aria-selected="false">单人关卡</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" id="pills-timeline-tab" data-toggle="pill" href="#pills-timeline" role="tab" aria-controls="pills-timeline" aria-selected="true">对战关卡</a>
-                    </li>
-                </ul>
+            <div class="row clearfix">
+                <div class="col-md-12 ">
+                    <div class="tab-content" id="pills-tabContent">
+                        <div class="tab-pane fade show active" id="pills-calendar" role="tabpanel" aria-labelledby="pills-calendar-tab">
+                            <div class="card">
+                                <div class="card-body">
+                                    <table class="table table-bordered table-hover">
+                                        <thead>
+                                        <tr>
+                                            <th>
+                                                关卡id
+                                            </th>
+                                            <th>
+                                                关卡名
+                                            </th>
+                                            <th>描述</th>
+                                            <th>详情</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
 
-                <div class="row clearfix">
-                    <div class="col-md-12 ">
-                        <div class="tab-content" id="pills-tabContent">
-                            <div class="tab-pane fade show active" id="pills-calendar" role="tabpanel" aria-labelledby="pills-calendar-tab">
-                                <div class="card">
-                                    <div class="card-body">
-                                        <table class="table table-bordered table-hover">
-                                            <thead>
-                                            <tr>
-                                                <th>
-                                                    关卡id
-                                                </th>
-                                                <th>
-                                                    关卡名
-                                                </th>
-                                                <th>描述</th>
-                                                <th>详情</th>
-                                            </tr>
-                                            </thead>
-                                            <tbody>
-
-                                            <#list list as item>
-                                                <#if item.numberType == 1>
-                                                    <tr>
-                                                        <td>
-                                                            ${item.id}
-                                                        </td>
-                                                        <td>
-                                                            ${item.name}
-                                                        </td>
-                                                        <td>
-                                                            ${item.describe}
-                                                        </td>
-                                                        <td>
-                                                            <a href="${req.contextPath}/backstage_level/detailItem?levelId=${item.id}"
-                                                               class="btn  btn-primary"
-                                                            >详情</a>
-                                                        </td>
-                                                    </tr>
-                                                </#if>
-                                            </#list>
-                                            </tbody>
-                                        </table>
-                                    </div>
+                                        <#list list as item>
+                                            <#if item.numberType == 1>
+                                                <tr>
+                                                    <td>
+                                                        ${item.id}
+                                                    </td>
+                                                    <td>
+                                                        ${item.name}
+                                                    </td>
+                                                    <td>
+                                                        ${item.describe}
+                                                    </td>
+                                                    <td>
+                                                        <a href="${req.contextPath}/backstage_level/detailItem?levelId=${item.id}"
+                                                           class="btn  btn-primary"
+                                                        >详情</a>
+                                                    </td>
+                                                </tr>
+                                            </#if>
+                                        </#list>
+                                        </tbody>
+                                    </table>
                                 </div>
                             </div>
+                        </div>
 
-                            <div class="tab-pane fade" id="pills-timeline" role="tabpanel" aria-labelledby="pills-timeline-tab">
-                                <div class="card">
-                                    <div class="card-body">
-                                        <table class="table table-bordered table-hover">
-                                            <thead>
-                                            <tr>
-                                                <th>
-                                                    关卡id
-                                                </th>
-                                                <th>
-                                                    关卡名
-                                                </th>
-                                                <th>描述</th>
-                                                <th>详情</th>
-                                            </tr>
-                                            </thead>
-                                            <tbody>
+                        <div class="tab-pane fade" id="pills-timeline" role="tabpanel" aria-labelledby="pills-timeline-tab">
+                            <div class="card">
+                                <div class="card-body">
+                                    <table class="table table-bordered table-hover">
+                                        <thead>
+                                        <tr>
+                                            <th>
+                                                关卡id
+                                            </th>
+                                            <th>
+                                                关卡名
+                                            </th>
+                                            <th>描述</th>
+                                            <th>详情</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
 
-                                            <#list list as item>
-                                                <#if item.numberType == 2>
-                                                    <tr>
-                                                        <td>
-                                                            ${item.id}
-                                                        </td>
-                                                        <td>
-                                                            ${item.name}
-                                                        </td>
-                                                        <td>
-                                                            ${item.describe}
-                                                        </td>
-                                                        <td>
-                                                            <a href="${req.contextPath}/backstage_level/detailItem?levelId=${item.id}"
-                                                               class="btn  btn-primary"
-                                                            >详情</a>
-                                                        </td>
-                                                    </tr>
-                                                </#if>
-                                            </#list>
-                                            </tbody>
-                                        </table>
-                                    </div>
+                                        <#list list as item>
+                                            <#if item.numberType == 2>
+                                                <tr>
+                                                    <td>
+                                                        ${item.id}
+                                                    </td>
+                                                    <td>
+                                                        ${item.name}
+                                                    </td>
+                                                    <td>
+                                                        ${item.describe}
+                                                    </td>
+                                                    <td>
+                                                        <a href="${req.contextPath}/backstage_level/detailItem?levelId=${item.id}"
+                                                           class="btn  btn-primary"
+                                                        >详情</a>
+                                                    </td>
+                                                </tr>
+                                            </#if>
+                                        </#list>
+                                        </tbody>
+                                    </table>
                                 </div>
                             </div>
-
                         </div>
 
-
                     </div>
-                </div>
 
+
+                </div>
             </div>
 
         </div>
 
     </div>
+
 </div>
 
 <!-- jQuery and bootstrtap js -->

src/main/resources/templates/ble/generate-copy.ftl

@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<#include "../common/header.ftl">
+<#setting number_format="#">
+
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body class="font-opensans  sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "生成蓝牙mac地址">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+        <div class="section-body">
+            <div class="container-fluid">
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <div class="card">
+<#--                            <div class="card-header">-->
+<#--                                <h3 class="card-title">生成数量(1-100)</h3>-->
+<#--                            </div>-->
+<#--                            <div class="card-body">-->
+<#--                                <form role="form" name="BLECodeForm" method="post" action="${req.contextPath}/backstage_ble/generateBLECode">-->
+<#--                                    <div class="input-group mb-3 ">-->
+<#--                                        <h6>数量：</h6>-->
+<#--                                        <input type="number" class="form-control" name="number" value="${(number)!''}"/>-->
+<#--                                        <h6>名字：</h6>-->
+<#--                                        <input type="text" class="form-control" name="name" value="${(name)!''}"/>-->
+<#--                                        <h6>开始下标：</h6>-->
+<#--                                        <input type="number" class="form-control" name="startIndex" value="${(startIndex)!''}"/>-->
+
+<#--                                        <div class="input-group-append">-->
+<#--                                            <button type="submit" class="btn btn-primary">生成数量(1-100)</button>-->
+<#--                                        </div>-->
+<#--                                    </div>-->
+<#--                                </form>-->
+<#--                            </div>-->
+
+                            <div class="card-body">
+                                <form role="form" name="BLESingleForm" method="post" action="${req.contextPath}/backstage_ble/generateBLESingleData">
+                                    <div class="input-group mb-3 ">
+                                        <h6>名字：</h6>
+                                        <input type="text" class="form-control" name="singleName" value="${(singleName)!''}"/>
+                                        <h6>mac地址：</h6>
+                                        <input type="text" class="form-control" name="mac" value="${(mac)!''}"/>
+                                        <div class="input-group-append">
+                                            <button type="submit" class="btn btn-primary">生成单个数据</button>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                        <div class="row clearfix">
+                            <div class="col-md-12 ">
+                                <div class="card">
+                                    <div class="card-header">
+                                        <h5>
+                                            生成的蓝牙mac列表
+                                        </h5>
+                                    </div>
+                                    <div class="card-body">
+                                        <table class="table table-bordered table-hover">
+                                            <thead>
+                                            <tr>
+                                                <th>
+                                                    蓝牙id
+                                                </th>
+                                                <th>
+                                                    绑定的用户id
+                                                </th>
+                                                <th>
+                                                    蓝牙名字
+                                                </th>
+                                                <th>
+                                                    蓝牙地址
+                                                </th>
+                                                <th>
+                                                    设备状态
+                                                </th>
+                                                <th>
+                                                    设备类型
+                                                </th>
+                                                <th>是否分享</th>
+                                                <th>设备标识</th>
+                                                <th>
+                                                    操作
+                                                </th>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <#if bleInfos??>
+                                            <#list bleInfos as item>
+                                                <tr>
+
+                                                    <td>
+                                                        ${item.bluetoothId}
+                                                    </td>
+                                                    <td>
+                                                        ${(item.userId)!''}
+                                                    </td>
+                                                    <td>
+                                                        ${(item.bluetoothName)!''}
+                                                    </td>
+                                                    <td>
+                                                        ${item.bluetoothMac}
+                                                    </td>
+                                                    <td>
+                                                        <#if item.bluetoothStatus == 1>
+                                                            <a style="color: red">
+                                                                已绑定
+                                                            </a>
+                                                        <#else >
+                                                            <a style="color: gray">
+                                                                未绑定
+                                                            </a>
+                                                        </#if>
+                                                    </td>
+                                                    <td>
+                                                        <#if item.bluetoothType == 1>
+                                                            <a style="color: red">
+                                                                普通绑带
+                                                            </a>
+                                                        <#elseif item.bluetoothType == 2>
+                                                            <a style="color: gray">
+                                                                沙袋绑带
+                                                            </a>
+                                                        <#elseif item.bluetoothType == 3>
+                                                            <a style="color: gray">
+                                                                手柄蓝牙
+                                                            </a>
+                                                        <#elseif item.bluetoothType == 0>
+                                                            <a style="color: gray">
+                                                                无
+                                                            </a>
+                                                        </#if>
+                                                    </td>
+                                                    <td>
+                                                        <#if item.isShare == 1>
+                                                            <a style="color: red">
+                                                                共享
+                                                            </a>
+                                                        <#else >
+                                                            <a style="color: gray">
+                                                                限制
+                                                            </a>
+                                                        </#if>
+                                                    </td>
+                                                    <td>
+                                                        ${(item.identifier)!''}
+                                                    </td>
+                                                    <td>
+                                                        <a href="${req.contextPath}/backstage_ble/deleteGenerateBLE?id=${item.bluetoothId}&identifier=${(item.identifier)!''}
+                                                        &single_name=${(singleName)!''}&mac=${(mac)!''}&name=${(name)!''}"
+                                                           type="button"
+                                                           class="btn btn-default btn-danger">删除</a>
+                                                    </td>
+                                                </tr>
+                                            </#list>
+                                            </#if>
+
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+
+                    </div>
+
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+</body>
+</html>

src/main/resources/templates/ble/generate.ftl

@@ -14,92 +14,85 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "生成蓝牙mac地址">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
-        <div class="section-body">
-            <div class="container-fluid">
-                <div class="row clearfix">
-                    <div class="col-md-12 ">
-                        <div class="card">
-<#--                            <div class="card-header">-->
-<#--                                <h3 class="card-title">生成数量(1-100)</h3>-->
-<#--                            </div>-->
-<#--                            <div class="card-body">-->
-<#--                                <form role="form" name="BLECodeForm" method="post" action="${req.contextPath}/backstage_ble/generateBLECode">-->
-<#--                                    <div class="input-group mb-3 ">-->
-<#--                                        <h6>数量：</h6>-->
-<#--                                        <input type="number" class="form-control" name="number" value="${(number)!''}"/>-->
-<#--                                        <h6>名字：</h6>-->
-<#--                                        <input type="text" class="form-control" name="name" value="${(name)!''}"/>-->
-<#--                                        <h6>开始下标：</h6>-->
-<#--                                        <input type="number" class="form-control" name="startIndex" value="${(startIndex)!''}"/>-->
+    <div style="height: 10px;"></div>
+    <div class="section-body">
+        <div class="container-fluid">
+            <div class="row clearfix">
+                <div class="col-md-12 ">
+                    <div class="card">
+                        <#--                            <div class="card-header">-->
+                        <#--                                <h3 class="card-title">生成数量(1-100)</h3>-->
+                        <#--                            </div>-->
+                        <#--                            <div class="card-body">-->
+                        <#--                                <form role="form" name="BLECodeForm" method="post" action="${req.contextPath}/backstage_ble/generateBLECode">-->
+                        <#--                                    <div class="input-group mb-3 ">-->
+                        <#--                                        <h6>数量：</h6>-->
+                        <#--                                        <input type="number" class="form-control" name="number" value="${(number)!''}"/>-->
+                        <#--                                        <h6>名字：</h6>-->
+                        <#--                                        <input type="text" class="form-control" name="name" value="${(name)!''}"/>-->
+                        <#--                                        <h6>开始下标：</h6>-->
+                        <#--                                        <input type="number" class="form-control" name="startIndex" value="${(startIndex)!''}"/>-->
 
-<#--                                        <div class="input-group-append">-->
-<#--                                            <button type="submit" class="btn btn-primary">生成数量(1-100)</button>-->
-<#--                                        </div>-->
-<#--                                    </div>-->
-<#--                                </form>-->
-<#--                            </div>-->
+                        <#--                                        <div class="input-group-append">-->
+                        <#--                                            <button type="submit" class="btn btn-primary">生成数量(1-100)</button>-->
+                        <#--                                        </div>-->
+                        <#--                                    </div>-->
+                        <#--                                </form>-->
+                        <#--                            </div>-->
 
-                            <div class="card-body">
-                                <form role="form" name="BLESingleForm" method="post" action="${req.contextPath}/backstage_ble/generateBLESingleData">
-                                    <div class="input-group mb-3 ">
-                                        <h6>名字：</h6>
-                                        <input type="text" class="form-control" name="singleName" value="${(singleName)!''}"/>
-                                        <h6>mac地址：</h6>
-                                        <input type="text" class="form-control" name="mac" value="${(mac)!''}"/>
-                                        <div class="input-group-append">
-                                            <button type="submit" class="btn btn-primary">生成单个数据</button>
-                                        </div>
+                        <div class="card-body">
+                            <form role="form" name="BLESingleForm" method="post" action="${req.contextPath}/backstage_ble/generateBLESingleData">
+                                <div class="input-group mb-3 ">
+                                    <h6>名字：</h6>
+                                    <input type="text" class="form-control" name="singleName" value="${(singleName)!''}"/>
+                                    <h6>mac地址：</h6>
+                                    <input type="text" class="form-control" name="mac" value="${(mac)!''}"/>
+                                    <div class="input-group-append">
+                                        <button type="submit" class="btn btn-primary">生成单个数据</button>
                                     </div>
-                                </form>
-                            </div>
+                                </div>
+                            </form>
                         </div>
-                        <div class="row clearfix">
-                            <div class="col-md-12 ">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h5>
-                                            生成的蓝牙mac列表
-                                        </h5>
-                                    </div>
-                                    <div class="card-body">
-                                        <table class="table table-bordered table-hover">
-                                            <thead>
-                                            <tr>
-                                                <th>
-                                                    蓝牙id
-                                                </th>
-                                                <th>
-                                                    绑定的用户id
-                                                </th>
-                                                <th>
-                                                    蓝牙名字
-                                                </th>
-                                                <th>
-                                                    蓝牙地址
-                                                </th>
-                                                <th>
-                                                    设备状态
-                                                </th>
-                                                <th>
-                                                    设备类型
-                                                </th>
-                                                <th>是否分享</th>
-                                                <th>设备标识</th>
-                                                <th>
-                                                    操作
-                                                </th>
-                                            </tr>
-                                            </thead>
-                                            <tbody>
-                                            <#if bleInfos??>
+                    </div>
+                    <div class="row clearfix">
+                        <div class="col-md-12 ">
+                            <div class="card">
+                                <div class="card-header">
+                                    <h5>
+                                        生成的蓝牙mac列表
+                                    </h5>
+                                </div>
+                                <div class="card-body">
+                                    <table class="table table-bordered table-hover">
+                                        <thead>
+                                        <tr>
+                                            <th>
+                                                蓝牙id
+                                            </th>
+                                            <th>
+                                                绑定的用户id
+                                            </th>
+                                            <th>
+                                                蓝牙名字
+                                            </th>
+                                            <th>
+                                                蓝牙地址
+                                            </th>
+                                            <th>
+                                                设备状态
+                                            </th>
+                                            <th>
+                                                设备类型
+                                            </th>
+                                            <th>是否分享</th>
+                                            <th>设备标识</th>
+                                            <th>
+                                                操作
+                                            </th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <#if bleInfos??>
                                             <#list bleInfos as item>
                                                 <tr>
 
@@ -167,23 +160,23 @@
                                                     </td>
                                                 </tr>
                                             </#list>
-                                            </#if>
+                                        </#if>
 
-                                            </tbody>
-                                        </table>
-                                    </div>
+                                        </tbody>
+                                    </table>
                                 </div>
-
                             </div>
-                        </div>
 
+                        </div>
                     </div>
 
                 </div>
-            </div>
 
+            </div>
         </div>
+
     </div>
+
 </div>
 <!-- jQuery and bootstrtap js -->
 <script src="../main-bundles/lib.vendor.bundle.js"></script>

src/main/resources/templates/ble/list-copy.ftl

@@ -0,0 +1,214 @@
+<!DOCTYPE html>
+<#include "../common/header.ftl">
+<#setting number_format="#">
+
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body class="font-opensans  sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "设备蓝牙列表">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+        <div class="section-body">
+            <div class="container-fluid">
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <div class="card">
+                            <div class="card-header">
+                                <h3 class="card-title">mac地址</h3>
+                            </div>
+                            <div class="card-body">
+                                <form role="form" name="nickForm" method="post"
+                                      action="${req.contextPath}/backstage_ble/searchBluetoothInfo">
+
+                                    <div class="input-group mb-3 ">
+                                        <input type="text" class="form-control" name="bleMac"
+                                               value="${(bleMac)!''}"/>
+
+                                        <#if bleMac??>
+                                            <label>当前页数</label>
+                                            <input type="text" name="page" value="${currentPage}">
+                                            <input hidden type="text" name="size" value="${size}">
+                                        </#if>
+                                        <div class="input-group-append">
+                                            <button type="submit" class="btn btn-primary">查询</button>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                        <div class="row clearfix">
+                            <div class="col-md-12 ">
+                                <div class="card">
+                                    <div class="card-header">
+                                        <h3>
+                                            设备列表
+                                        </h3>
+                                    </div>
+                                    <div class="card-body">
+                                        <table class="table table-bordered table-hover">
+                                            <thead>
+                                            <tr>
+                                                <th>
+                                                    蓝牙id
+                                                </th>
+                                                <th>
+                                                    绑定的用户id
+                                                </th>
+                                                <th>
+                                                    蓝牙名字
+                                                </th>
+                                                <th>
+                                                    蓝牙地址
+                                                </th>
+                                                <th>
+                                                    设备状态
+                                                </th>
+                                                <th>
+                                                    设备类型
+                                                </th>
+                                                <th>是否分享</th>
+                                                <th>设备标识</th>
+
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+
+                                            <#list bleInfos.content as item>
+                                                <tr>
+
+                                                    <td>
+                                                        ${item.bluetoothId}
+                                                    </td>
+                                                    <td>
+                                                        ${(item.userId)!''}
+                                                    </td>
+                                                    <td>
+                                                        ${(item.bluetoothName)!''}
+                                                    </td>
+                                                    <td>
+                                                        ${item.bluetoothMac}
+                                                    </td>
+                                                    <td>
+                                                        <#if item.bluetoothStatus == 1>
+                                                            <a href="${req.contextPath}/backstage_ble/reset_bind?bleMac=${item.bluetoothMac}" class="btn btn-danger">取消绑定</a>
+                                                        <#else >
+                                                            <a style="color: gray">
+                                                                未绑定
+                                                            </a>
+                                                        </#if>
+                                                    </td>
+                                                    <td>
+                                                        <#if item.bluetoothType == 1>
+                                                            <a style="color: red">
+                                                                普通绑带
+                                                            </a>
+                                                        <#elseif item.bluetoothType == 2>
+                                                            <a style="color: gray">
+                                                                沙袋绑带
+                                                            </a>
+                                                        <#elseif item.bluetoothType == 3>
+                                                            <a style="color: gray">
+                                                                手柄蓝牙
+                                                            </a>
+                                                        <#elseif item.bluetoothType == 0>
+                                                            <a style="color: gray">
+                                                                无
+                                                            </a>
+                                                        </#if>
+                                                    </td>
+                                                    <td>
+                                                        <#if item.isShare == 1>
+                                                            <a style="color: red">
+                                                                共享
+                                                            </a>
+                                                        <#else >
+                                                            <a style="color: gray">
+                                                                限制
+                                                            </a>
+                                                        </#if>
+                                                    </td>
+                                                    <td>
+                                                        ${(item.identifier)!''}
+                                                    </td>
+
+                                                </tr>
+                                            </#list>
+
+
+                                            </tbody>
+                                        </table>
+
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+                <#--分页-->
+                <#if bleMac??>
+                <#else >
+                    <div class="row clearfix">
+                        <div class="col-md-12 ">
+                            <nav aria-label="Page navigation example">
+                                <ul class="pagination pull-right">
+                                    <#if currentPage lte 1>
+                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
+                                    <#else>
+                                        <li class="page-item ">
+                                            <a class="page-link" href="${req.contextPath}/backstage_ble/list?page=${currentPage - 1}&size=${size}">上一页</a>
+                                        </li>
+                                    </#if>
+
+                                    <#list 1..bleInfos.getTotalPages() as index>
+                                        <#if currentPage == index>
+                                            <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
+                                            </li>
+                                        <#else>
+                                            <li class="page-item ">
+                                                <a class="page-link"
+                                                   href="${req.contextPath}/backstage_ble/list?page=${index}&size=${size}">${index}</a>
+                                            </li>
+                                        </#if>
+                                    </#list>
+
+                                    <#if currentPage gte bleInfos.getTotalPages()>
+                                        <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+                                    <#else>
+                                        <li class="page-item ">
+                                            <a class="page-link"
+                                               href="${req.contextPath}/backstage_ble/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                        </li>
+                                    </#if>
+                                </ul>
+                            </nav>
+
+                        </div>
+                    </div>
+                </#if>
+            </div>
+
+        </div>
+    </div>
+</div>
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+</body>
+</html>

src/main/resources/templates/ble/list.ftl

@@ -14,196 +14,188 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "设备蓝牙列表">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
-        <div class="section-body">
-            <div class="container-fluid">
-                <div class="row clearfix">
-                    <div class="col-md-12 ">
-                        <div class="card">
-                            <div class="card-header">
-                                <h3 class="card-title">mac地址</h3>
-                            </div>
-                            <div class="card-body">
-                                <form role="form" name="nickForm" method="post"
-                                      action="${req.contextPath}/backstage_ble/searchBluetoothInfo">
-
-                                    <div class="input-group mb-3 ">
-                                        <input type="text" class="form-control" name="bleMac"
-                                               value="${(bleMac)!''}"/>
-
-                                        <#if bleMac??>
-                                            <label>当前页数</label>
-                                            <input type="text" name="page" value="${currentPage}">
-                                            <input hidden type="text" name="size" value="${size}">
-                                        </#if>
-                                        <div class="input-group-append">
-                                            <button type="submit" class="btn btn-primary">查询</button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
+    <div style="height: 10px;"></div>
+    <div class="section-body">
+        <div class="container-fluid">
+            <div class="row clearfix">
+                <div class="col-md-12 ">
+                    <div class="card">
+                        <div class="card-header">
+                            <h3 class="card-title">mac地址</h3>
                         </div>
-                        <div class="row clearfix">
-                            <div class="col-md-12 ">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>
-                                            设备列表
-                                        </h3>
+                        <div class="card-body">
+                            <form role="form" name="nickForm" method="post"
+                                  action="${req.contextPath}/backstage_ble/searchBluetoothInfo">
+
+                                <div class="input-group mb-3 ">
+                                    <input type="text" class="form-control" name="bleMac"
+                                           value="${(bleMac)!''}"/>
+
+                                    <#if bleMac??>
+                                        <label>当前页数</label>
+                                        <input type="text" name="page" value="${currentPage}">
+                                        <input hidden type="text" name="size" value="${size}">
+                                    </#if>
+                                    <div class="input-group-append">
+                                        <button type="submit" class="btn btn-primary">查询</button>
                                     </div>
-                                    <div class="card-body">
-                                        <table class="table table-bordered table-hover">
-                                            <thead>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                    <div class="row clearfix">
+                        <div class="col-md-12 ">
+                            <div class="card">
+                                <div class="card-header">
+                                    <h3>
+                                        设备列表
+                                    </h3>
+                                </div>
+                                <div class="card-body">
+                                    <table class="table table-bordered table-hover">
+                                        <thead>
+                                        <tr>
+                                            <th>
+                                                蓝牙id
+                                            </th>
+                                            <th>
+                                                绑定的用户id
+                                            </th>
+                                            <th>
+                                                蓝牙名字
+                                            </th>
+                                            <th>
+                                                蓝牙地址
+                                            </th>
+                                            <th>
+                                                设备状态
+                                            </th>
+                                            <th>
+                                                设备类型
+                                            </th>
+                                            <th>是否分享</th>
+                                            <th>设备标识</th>
+
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+
+                                        <#list bleInfos.content as item>
                                             <tr>
-                                                <th>
-                                                    蓝牙id
-                                                </th>
-                                                <th>
-                                                    绑定的用户id
-                                                </th>
-                                                <th>
-                                                    蓝牙名字
-                                                </th>
-                                                <th>
-                                                    蓝牙地址
-                                                </th>
-                                                <th>
-                                                    设备状态
-                                                </th>
-                                                <th>
-                                                    设备类型
-                                                </th>
-                                                <th>是否分享</th>
-                                                <th>设备标识</th>
+
+                                                <td>
+                                                    ${item.bluetoothId}
+                                                </td>
+                                                <td>
+                                                    ${(item.userId)!''}
+                                                </td>
+                                                <td>
+                                                    ${(item.bluetoothName)!''}
+                                                </td>
+                                                <td>
+                                                    ${item.bluetoothMac}
+                                                </td>
+                                                <td>
+                                                    <#if item.bluetoothStatus == 1>
+                                                        <a href="${req.contextPath}/backstage_ble/reset_bind?bleMac=${item.bluetoothMac}" class="btn btn-danger">取消绑定</a>
+                                                    <#else >
+                                                        <a style="color: gray">
+                                                            未绑定
+                                                        </a>
+                                                    </#if>
+                                                </td>
+                                                <td>
+                                                    <#if item.bluetoothType == 1>
+                                                        <a style="color: red">
+                                                            普通绑带
+                                                        </a>
+                                                    <#elseif item.bluetoothType == 2>
+                                                        <a style="color: gray">
+                                                            沙袋绑带
+                                                        </a>
+                                                    <#elseif item.bluetoothType == 3>
+                                                        <a style="color: gray">
+                                                            手柄蓝牙
+                                                        </a>
+                                                    <#elseif item.bluetoothType == 0>
+                                                        <a style="color: gray">
+                                                            无
+                                                        </a>
+                                                    </#if>
+                                                </td>
+                                                <td>
+                                                    <#if item.isShare == 1>
+                                                        <a style="color: red">
+                                                            共享
+                                                        </a>
+                                                    <#else >
+                                                        <a style="color: gray">
+                                                            限制
+                                                        </a>
+                                                    </#if>
+                                                </td>
+                                                <td>
+                                                    ${(item.identifier)!''}
+                                                </td>
 
                                             </tr>
-                                            </thead>
-                                            <tbody>
-
-                                            <#list bleInfos.content as item>
-                                                <tr>
-
-                                                    <td>
-                                                        ${item.bluetoothId}
-                                                    </td>
-                                                    <td>
-                                                        ${(item.userId)!''}
-                                                    </td>
-                                                    <td>
-                                                        ${(item.bluetoothName)!''}
-                                                    </td>
-                                                    <td>
-                                                        ${item.bluetoothMac}
-                                                    </td>
-                                                    <td>
-                                                        <#if item.bluetoothStatus == 1>
-                                                            <a href="${req.contextPath}/backstage_ble/reset_bind?bleMac=${item.bluetoothMac}" class="btn btn-danger">取消绑定</a>
-                                                        <#else >
-                                                            <a style="color: gray">
-                                                                未绑定
-                                                            </a>
-                                                        </#if>
-                                                    </td>
-                                                    <td>
-                                                        <#if item.bluetoothType == 1>
-                                                            <a style="color: red">
-                                                                普通绑带
-                                                            </a>
-                                                        <#elseif item.bluetoothType == 2>
-                                                            <a style="color: gray">
-                                                                沙袋绑带
-                                                            </a>
-                                                        <#elseif item.bluetoothType == 3>
-                                                            <a style="color: gray">
-                                                                手柄蓝牙
-                                                            </a>
-                                                        <#elseif item.bluetoothType == 0>
-                                                            <a style="color: gray">
-                                                                无
-                                                            </a>
-                                                        </#if>
-                                                    </td>
-                                                    <td>
-                                                        <#if item.isShare == 1>
-                                                            <a style="color: red">
-                                                                共享
-                                                            </a>
-                                                        <#else >
-                                                            <a style="color: gray">
-                                                                限制
-                                                            </a>
-                                                        </#if>
-                                                    </td>
-                                                    <td>
-                                                        ${(item.identifier)!''}
-                                                    </td>
-
-                                                </tr>
-                                            </#list>
-
-
-                                            </tbody>
-                                        </table>
+                                        </#list>
 
-                                    </div>
-                                </div>
 
+                                        </tbody>
+                                    </table>
+
+                                </div>
                             </div>
-                        </div>
 
+                        </div>
                     </div>
+
                 </div>
-                <#--分页-->
-                <#if bleMac??>
-                <#else >
-                    <div class="row clearfix">
-                        <div class="col-md-12 ">
-                            <nav aria-label="Page navigation example">
-                                <ul class="pagination pull-right">
-                                    <#if currentPage lte 1>
-                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
-                                    <#else>
-                                        <li class="page-item ">
-                                            <a class="page-link" href="${req.contextPath}/backstage_ble/list?page=${currentPage - 1}&size=${size}">上一页</a>
+            </div>
+            <#--分页-->
+            <#if bleMac??>
+            <#else >
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <nav aria-label="Page navigation example">
+                            <ul class="pagination pull-right">
+                                <#if currentPage lte 1>
+                                    <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
+                                <#else>
+                                    <li class="page-item ">
+                                        <a class="page-link" href="${req.contextPath}/backstage_ble/list?page=${currentPage - 1}&size=${size}">上一页</a>
+                                    </li>
+                                </#if>
+
+                                <#list 1..bleInfos.getTotalPages() as index>
+                                    <#if currentPage == index>
+                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
                                         </li>
-                                    </#if>
-
-                                    <#list 1..bleInfos.getTotalPages() as index>
-                                        <#if currentPage == index>
-                                            <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
-                                            </li>
-                                        <#else>
-                                            <li class="page-item ">
-                                                <a class="page-link"
-                                                   href="${req.contextPath}/backstage_ble/list?page=${index}&size=${size}">${index}</a>
-                                            </li>
-                                        </#if>
-                                    </#list>
-
-                                    <#if currentPage gte bleInfos.getTotalPages()>
-                                        <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
                                     <#else>
                                         <li class="page-item ">
                                             <a class="page-link"
-                                               href="${req.contextPath}/backstage_ble/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                               href="${req.contextPath}/backstage_ble/list?page=${index}&size=${size}">${index}</a>
                                         </li>
                                     </#if>
-                                </ul>
-                            </nav>
+                                </#list>
+
+                                <#if currentPage gte bleInfos.getTotalPages()>
+                                    <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+                                <#else>
+                                    <li class="page-item ">
+                                        <a class="page-link"
+                                           href="${req.contextPath}/backstage_ble/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                    </li>
+                                </#if>
+                            </ul>
+                        </nav>
 
-                        </div>
                     </div>
-                </#if>
-            </div>
-
+                </div>
+            </#if>
         </div>
+
     </div>
 </div>
 <!-- jQuery and bootstrtap js -->

src/main/resources/templates/common/header.ftl

@@ -12,5 +12,5 @@
     <#--    <script src="../main-plugins/bootstrap/js/bootstrap.min.js" ></script>-->
     <!-- Core css -->
     <link rel="stylesheet" href="../css/main-css/main.css"/>
-    <link rel="stylesheet" href="../css/main-css/theme3.css" id="stylesheet"/>
+    <link rel="stylesheet" href="../css/main-css/theme1.css" id="stylesheet"/>
 </head>

src/main/resources/templates/common/iconMenu.ftl

@@ -5,7 +5,7 @@
             <div class="dropdown">
                 <a href="javascript:void(0)" class="nav-link icon menu_toggle"><i class="fa fa-navicon"></i></a>
 <#--                <a href="javascript:void(0)" class="nav-link user_btn"><img class="avatar" src="../images/user.png" alt=""/></a>-->
-                <a href="${req.contextPath}/backstage_user/list" class="nav-link icon"><i class="fa fa-home"></i></a>
+                <a href="${req.contextPath}/backstage_manager/index" class="nav-link icon"><i class="fa fa-home"></i></a>
                 <a href="${req.contextPath}/backstage_file_management/file_manager" class="nav-link icon app_file xs-hide"><i
                             class="fa fa-folder"></i></a>
             </div>

src/main/resources/templates/common/startMainMenu.ftl

@@ -20,27 +20,29 @@
             <nav class="sidebar-nav">
                 <ul class="metismenu ci-effect-1">
                     <li class="g_heading">功能列表</li>
-
-                    <li><a href="${req.contextPath}/backstage_user/list"><i class="icon-users"></i><span
+                    <#--   ${req.contextPath}/backstage_user/list -->
+                    <li><a id="IdUserList" href="javascript:void(0)"><i class="icon-users"></i><span
                                     data-hover="Users">用户列表</span></a></li>
                     <li>
                         <a href="javascript:void(0)" class="has-arrow arrow-b"><i class="fa fa-qrcode"></i><span
                                     data-hover="QRCode">二维码</span></a>
                         <ul>
-                            <li><a href="${req.contextPath}/backstage_device/list"><span data-hover="List">列表</span></a>
+                            <#--  ${req.contextPath}/backstage_device/list -->
+                            <li><a id="IdQRCodeList" href="javascript:void(0)"><span data-hover="List">列表</span></a>
                             </li>
-                            <li><a href="${req.contextPath}/backstage_device/generateManager"><span
-                                            data-hover="Generate">生成二维码</span></a></li>
+                            <#-- ${req.contextPath}/backstage_device/generateManager-->
+                            <li><a id="IdQRCodeGenerate" href="javascript:void(0)"><span data-hover="Generate">生成二维码</span></a></li>
                         </ul>
                     </li>
                     <li>
                         <a href="javascript:void(0)" class="has-arrow arrow-b"><i class="fa fa-bluetooth-b"></i><span
                                     data-hover="BLE">蓝牙设备</span></a>
                         <ul>
-                            <li><a href="${req.contextPath}/backstage_ble/list"><span data-hover="List">列表</span></a>
+                            <#--${req.contextPath}/backstage_ble/list-->
+                            <li><a  id="IdBLEList" href="javascript:void(0)"><span data-hover="List">列表</span></a>
                             </li>
-                            <li><a href="${req.contextPath}/backstage_ble/generateManager"><span
-                                            data-hover="Generate">生成蓝牙信息</span></a></li>
+                            <#--${req.contextPath}/backstage_ble/generateManager-->
+                            <li><a  id="IdBLEGenerate" href="javascript:void(0)"><span data-hover="Generate">生成蓝牙信息</span></a></li>
                         </ul>
                     </li>
 
@@ -49,9 +51,11 @@
                                     class="icon-game-controller"></i><span
                                     data-hover="Game">游戏</span></a>
                         <ul>
-                            <li><a href="${req.contextPath}/backstage_game/list"><span
+                            <#--${req.contextPath}/backstage_game/list-->
+                            <li><a id="IdGameList"  href="javascript:void(0)"><span
                                             data-hover="List">列表</span></a></li>
-                            <li><a href="${req.contextPath}/backstage_game/add"><span
+                            <#--${req.contextPath}/backstage_game/add-->
+                            <li><a id="IdGameNew" href="javascript:void(0)"><span
                                             data-hover="NewGame">新的游戏</span></a></li>
                         </ul>
                     </li>
@@ -59,13 +63,15 @@
                         <a href="javascript:void(0)" class="has-arrow arrow-b"><i class="icon-picture"></i><span
                                     data-hover="picture">图片</span></a>
                         <ul>
-                            <li><a href="${req.contextPath}/backstage_picture/list"><span
+                            <#--${req.contextPath}/backstage_picture/list-->
+                            <li><a id="IdPictureList" href="javascript:void(0)"><span
                                             data-hover="List">列表</span></a></li>
                         </ul>
                     </li>
-                    <li><a href="${req.contextPath}/backstage_file_management/file_manager"><i
-                                    class="icon-folder"></i><span
-                                    data-hover="FileManager">文件管理</span></a></li>
+                    <#--${req.contextPath}/backstage_file_management/file_manager-->
+                    <#--<li><a id="IdFileManager" href="javascript:void(0)"><i-->
+                    <#--                class="icon-folder"></i><span-->
+                    <#--                data-hover="FileManager">文件管理</span></a></li>-->
 
                     <li class="g_heading">产品管理</li>
 
@@ -73,7 +79,8 @@
                         <a href="javascript:void(0)" class="has-arrow arrow-b"><i class="icon-layers"></i><span
                                     data-hover="CategoryManager">分类管理</span></a>
                         <ul>
-                            <li><a href="${req.contextPath}/backstage_tag/list"><span data-hover="List">标签列表</span></a>
+                            <#--${req.contextPath}/backstage_tag/list-->
+                            <li><a id="IdCategoryList" href="javascript:void(0)"><span data-hover="List">标签列表</span></a>
                             </li>
 <#--                            <li><a href="${req.contextPath}/backstage_device/generateManager"><span-->
 <#--                                            data-hover="Generate">生成二维码</span></a></li>-->
@@ -86,7 +93,8 @@
                         <a href="javascript:void(0)" class="has-arrow arrow-b"><i class="icon-bar-chart"></i><span
                                     data-hover="Client">前端</span></a>
                         <ul>
-                            <li><a href="${req.contextPath}/backstage_log/client"><span data-hover="log">日志</span></a>
+                            <#--${req.contextPath}/backstage_log/client-->
+                            <li><a Id="IdClientLog" href="javascript:void(0)"><span data-hover="log">日志</span></a>
                             </li>
                         </ul>
                     </li>
@@ -103,9 +111,11 @@
                                     class="icon-game-controller"></i><span
                                     data-hover="Game">关卡信息</span></a>
                         <ul>
-                            <li><a href="${req.contextPath}/backstage_level/getLevelJumpList"><span
+                            <#--${req.contextPath}/backstage_level/getLevelJumpList-->
+                            <li><a id="IdLevelList" href="javascript:void(0)"><span
                                             data-hover="List">列表</span></a></li>
-                            <li><a href="${req.contextPath}/backstage_level/add"><span
+                            <#--${req.contextPath}/backstage_level/add-->
+                            <li><a id="IdLevelNew" href="javascript:void(0)"><span
                                             data-hover="NewLevel">新的关卡</span></a></li>
                         </ul>
                     </li>

src/main/resources/templates/device/generate-copy.ftl

@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+<#include "../common/header.ftl">
+<#setting number_format="#">
+
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body class="font-opensans  sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "生成二维码">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+        <div class="section-body">
+            <div class="container-fluid">
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <div class="card">
+                            <div class="card-header">
+                                <h3 class="card-title">生成二维码数量(1-100)</h3>
+                            </div>
+                            <div class="card-body">
+                                <form role="form" name="QRCodeForm" method="post" action="${req.contextPath}/backstage_device/generateDeviceCode">
+                                    <div class="input-group mb-3 ">
+                                        <input type="number" class="form-control" name="number" value="${(number)!''}"/>
+                                        <div class="input-group-append">
+                                            <button type="submit" class="btn btn-primary">生成</button>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                        <div class="row clearfix">
+                            <div class="col-md-12 ">
+                                <div class="card">
+                                    <div class="card-header">
+                                        <h3>
+                                            设备列表
+                                        </h3>
+                                    </div>
+                                    <div class="card-body">
+                                        <table class="table table-bordered table-hover">
+                                            <thead>
+                                            <tr>
+                                                <th>
+                                                    设备id
+                                                </th>
+                                                <th>
+                                                    绑定的用户id
+                                                </th>
+                                                <th>
+                                                    设备的uuid
+                                                </th>
+                                                <th>
+                                                    设备状态
+                                                </th>
+                                                <th>
+                                                    设备类型
+                                                </th>
+
+                                                <th>设备标识</th>
+
+                                                <#--                            <th>详情</th>-->
+
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <#if deviceInfos??>
+
+                                                <#list deviceInfos as item>
+                                                    <tr>
+
+                                                        <td>
+                                                            ${item.deviceId}
+                                                        </td>
+                                                        <td>
+                                                            ${(item.userId)!''}
+                                                        </td>
+                                                        <td>
+                                                            ${item.deviceUuid}
+                                                        </td>
+                                                        <td>
+                                                            <#if item.deviceStatus == 1>
+                                                                <a style="color: red">
+                                                                    已绑定
+                                                                </a>
+                                                            <#else >
+                                                                <a style="color: gray">
+                                                                    未绑定
+                                                                </a>
+                                                            </#if>
+                                                        </td>
+                                                        <td>
+                                                            <#if item.deviceType == 1>
+                                                                <a style="color: red">
+                                                                    拳击柱
+                                                                </a>
+                                                            <#elseif item.deviceType == 2>
+                                                                <a style="color: gray">
+                                                                    蹦床
+                                                                </a>
+                                                            </#if>
+                                                        </td>
+                                                        <td style="color: red">
+                                                            ${item.identifier}
+                                                        </td>
+                                                        <#--                                    <td>-->
+                                                        <#--                                        <a href=""-->
+                                                        <#--                                           class="btn btn-default btn-primary"-->
+                                                        <#--                                        >详情</a>-->
+                                                        <#--                                    </td>-->
+
+                                                    </tr>
+                                                </#list>
+                                            <#else >
+
+                                            </#if>
+
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+
+                    </div>
+
+                </div>
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <div class="card">
+                            <div class="card-header">
+                                <h3 class="card-title">下载当前设备标识的zip压缩文件</h3>
+                            </div>
+                            <div class="card-body">
+                                <form method="post" action="${req.contextPath}/backstage_device/download">
+                                    <div class="form-group">
+                                        <input type="number" class="form-control" name="identifier" value="${(identifier)!''}"/>
+                                    </div>
+                                    <button type="submit" class="btn btn-primary">下载标识二维码zip</button>
+                                </form>
+                            </div>
+                        </div>
+
+
+                    </div>
+
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+</body>
+</html>

src/main/resources/templates/device/generate.ftl

@@ -14,150 +14,139 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "生成二维码">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
-        <div class="section-body">
-            <div class="container-fluid">
+    <div style="height: 10px;"></div>
+    <div class="container-fluid">
+        <div class="row clearfix">
+            <div class="col-md-12 ">
+                <div class="card">
+                    <div class="card-header">
+                        <h3 class="card-title">生成二维码数量(1-100)</h3>
+                    </div>
+                    <div class="card-body">
+                        <form role="form" name="QRCodeForm" method="post" action="${req.contextPath}/backstage_device/generateDeviceCode">
+                            <div class="input-group mb-3 ">
+                                <input type="number" class="form-control" name="number" value="${(number)!''}"/>
+                                <div class="input-group-append">
+                                    <button type="submit" class="btn btn-primary">生成</button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
                 <div class="row clearfix">
                     <div class="col-md-12 ">
                         <div class="card">
                             <div class="card-header">
-                                <h3 class="card-title">生成二维码数量(1-100)</h3>
+                                <h3>
+                                    设备列表
+                                </h3>
                             </div>
                             <div class="card-body">
-                                <form role="form" name="QRCodeForm" method="post" action="${req.contextPath}/backstage_device/generateDeviceCode">
-                                    <div class="input-group mb-3 ">
-                                        <input type="number" class="form-control" name="number" value="${(number)!''}"/>
-                                        <div class="input-group-append">
-                                            <button type="submit" class="btn btn-primary">生成</button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-                        <div class="row clearfix">
-                            <div class="col-md-12 ">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>
-                                            设备列表
-                                        </h3>
-                                    </div>
-                                    <div class="card-body">
-                                        <table class="table table-bordered table-hover">
-                                            <thead>
+                                <table class="table table-bordered table-hover">
+                                    <thead>
+                                    <tr>
+                                        <th>
+                                            设备id
+                                        </th>
+                                        <th>
+                                            绑定的用户id
+                                        </th>
+                                        <th>
+                                            设备的uuid
+                                        </th>
+                                        <th>
+                                            设备状态
+                                        </th>
+                                        <th>
+                                            设备类型
+                                        </th>
+
+                                        <th>设备标识</th>
+
+                                        <#--                            <th>详情</th>-->
+
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <#if deviceInfos??>
+
+                                        <#list deviceInfos as item>
                                             <tr>
-                                                <th>
-                                                    设备id
-                                                </th>
-                                                <th>
-                                                    绑定的用户id
-                                                </th>
-                                                <th>
-                                                    设备的uuid
-                                                </th>
-                                                <th>
-                                                    设备状态
-                                                </th>
-                                                <th>
-                                                    设备类型
-                                                </th>
-
-                                                <th>设备标识</th>
 
-                                                <#--                            <th>详情</th>-->
+                                                <td>
+                                                    ${item.deviceId}
+                                                </td>
+                                                <td>
+                                                    ${(item.userId)!''}
+                                                </td>
+                                                <td>
+                                                    ${item.deviceUuid}
+                                                </td>
+                                                <td>
+                                                    <#if item.deviceStatus == 1>
+                                                        <a style="color: red">
+                                                            已绑定
+                                                        </a>
+                                                    <#else >
+                                                        <a style="color: gray">
+                                                            未绑定
+                                                        </a>
+                                                    </#if>
+                                                </td>
+                                                <td>
+                                                    <#if item.deviceType == 1>
+                                                        <a style="color: red">
+                                                            拳击柱
+                                                        </a>
+                                                    <#elseif item.deviceType == 2>
+                                                        <a style="color: gray">
+                                                            蹦床
+                                                        </a>
+                                                    </#if>
+                                                </td>
+                                                <td style="color: red">
+                                                    ${item.identifier}
+                                                </td>
+                                                <#--                                    <td>-->
+                                                <#--                                        <a href=""-->
+                                                <#--                                           class="btn btn-default btn-primary"-->
+                                                <#--                                        >详情</a>-->
+                                                <#--                                    </td>-->
 
                                             </tr>
-                                            </thead>
-                                            <tbody>
-                                            <#if deviceInfos??>
+                                        </#list>
+                                    <#else >
 
-                                                <#list deviceInfos as item>
-                                                    <tr>
-
-                                                        <td>
-                                                            ${item.deviceId}
-                                                        </td>
-                                                        <td>
-                                                            ${(item.userId)!''}
-                                                        </td>
-                                                        <td>
-                                                            ${item.deviceUuid}
-                                                        </td>
-                                                        <td>
-                                                            <#if item.deviceStatus == 1>
-                                                                <a style="color: red">
-                                                                    已绑定
-                                                                </a>
-                                                            <#else >
-                                                                <a style="color: gray">
-                                                                    未绑定
-                                                                </a>
-                                                            </#if>
-                                                        </td>
-                                                        <td>
-                                                            <#if item.deviceType == 1>
-                                                                <a style="color: red">
-                                                                    拳击柱
-                                                                </a>
-                                                            <#elseif item.deviceType == 2>
-                                                                <a style="color: gray">
-                                                                    蹦床
-                                                                </a>
-                                                            </#if>
-                                                        </td>
-                                                        <td style="color: red">
-                                                            ${item.identifier}
-                                                        </td>
-                                                        <#--                                    <td>-->
-                                                        <#--                                        <a href=""-->
-                                                        <#--                                           class="btn btn-default btn-primary"-->
-                                                        <#--                                        >详情</a>-->
-                                                        <#--                                    </td>-->
-
-                                                    </tr>
-                                                </#list>
-                                            <#else >
-
-                                            </#if>
-
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                </div>
+                                    </#if>
 
+                                    </tbody>
+                                </table>
                             </div>
                         </div>
 
                     </div>
-
                 </div>
-                <div class="row clearfix">
-                    <div class="col-md-12 ">
-                        <div class="card">
-                            <div class="card-header">
-                                <h3 class="card-title">下载当前设备标识的zip压缩文件</h3>
-                            </div>
-                            <div class="card-body">
-                                <form method="post" action="${req.contextPath}/backstage_device/download">
-                                    <div class="form-group">
-                                        <input type="number" class="form-control" name="identifier" value="${(identifier)!''}"/>
-                                    </div>
-                                    <button type="submit" class="btn btn-primary">下载标识二维码zip</button>
-                                </form>
-                            </div>
-                        </div>
 
+            </div>
 
+        </div>
+        <div class="row clearfix">
+            <div class="col-md-12 ">
+                <div class="card">
+                    <div class="card-header">
+                        <h3 class="card-title">下载当前设备标识的zip压缩文件</h3>
+                    </div>
+                    <div class="card-body">
+                        <form method="post" action="${req.contextPath}/backstage_device/download">
+                            <div class="form-group">
+                                <input type="number" class="form-control" name="identifier" value="${(identifier)!''}"/>
+                            </div>
+                            <button type="submit" class="btn btn-primary">下载标识二维码zip</button>
+                        </form>
                     </div>
-
                 </div>
+
+
             </div>
 
         </div>

src/main/resources/templates/device/list-copy.ftl

@@ -0,0 +1,232 @@
+<!DOCTYPE html>
+<#include "../common/header.ftl">
+<#setting number_format="#">
+
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body class="font-opensans  sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "设备二维码列表">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+        <div class="section-body">
+            <div class="container-fluid">
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <div class="card">
+                            <div class="card-header">
+                                <h3 class="card-title">设备uuid</h3>
+                            </div>
+                            <div class="card-body">
+                                <form role="form" name="nickForm" method="post"
+                                      action="${req.contextPath}/backstage_device/searchDeviceInfo">
+
+                                    <div class="input-group mb-3 ">
+                                        <input type="text" class="form-control" name="deviceUuid"
+                                               value="${(deviceUuid)!''}"/>
+
+                                        <#if deviceUuid??>
+                                            <label>当前页数</label>
+                                            <input type="text" name="page" value="${currentPage}">
+                                            <input hidden type="text" name="size" value="${size}">
+                                        </#if>
+                                        <div class="input-group-append">
+                                            <button type="submit" class="btn btn-primary">查询</button>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                        <div class="row clearfix">
+                            <div class="col-md-12 ">
+                                <div class="card">
+                                    <div class="card-header">
+                                        <h3>
+                                            设备列表
+                                        </h3>
+                                    </div>
+                                    <div class="card-body">
+                                        <table class="table table-bordered table-hover">
+                                            <thead>
+                                            <tr>
+                                                <th>
+                                                    设备id
+                                                </th>
+                                                <th>
+                                                    绑定的用户id
+                                                </th>
+                                                <th>
+                                                    设备的uuid
+                                                </th>
+                                                <th>
+                                                    设备状态
+                                                </th>
+                                                <th>
+                                                    设备类型
+                                                </th>
+
+                                                <th>设备标识</th>
+
+                                                <#--                            <th>详情</th>-->
+
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+
+                                            <#list deviceInfos.content as item>
+                                                <tr>
+
+                                                    <td>
+                                                        ${item.deviceId}
+                                                    </td>
+                                                    <td>
+                                                        ${(item.userId)!''}
+                                                    </td>
+                                                    <td>
+                                                        ${item.deviceUuid}
+                                                    </td>
+                                                    <td>
+                                                        <#if item.deviceStatus == 1>
+                                                            <a style="color: red">
+                                                                已绑定
+                                                            </a>
+                                                        <#else >
+                                                            <a style="color: gray">
+                                                                未绑定
+                                                            </a>
+                                                        </#if>
+                                                    </td>
+                                                    <td>
+                                                        <#if item.deviceType == 1>
+                                                            <a style="color: red">
+                                                                拳击柱
+                                                            </a>
+                                                        <#elseif item.deviceType == 2>
+                                                            <a style="color: gray">
+                                                                蹦床
+                                                            </a>
+                                                        </#if>
+                                                    </td>
+                                                    <td>
+                                                        ${item.identifier}
+                                                    </td>
+                                                    <#--                                <td>-->
+                                                    <#--                                    <a href=""-->
+                                                    <#--                                       class="btn btn-default btn-primary"-->
+                                                    <#--                                    >详情</a>-->
+                                                    <#--                                </td>-->
+
+                                                </tr>
+                                            </#list>
+
+
+                                            </tbody>
+                                        </table>
+
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+                <#--分页-->
+                <#if deviceUuid??>
+                <#else >
+                    <div class="row clearfix">
+                        <div class="col-md-12 ">
+                            <nav aria-label="Page navigation example">
+                                <ul class="pagination pull-right">
+                                    <#if currentPage lte 1>
+                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
+                                    <#else>
+                                        <li class="page-item ">
+                                            <a class="page-link" href="${req.contextPath}/backstage_device/list?page=${currentPage - 1}&size=${size}">上一页</a>
+                                        </li>
+                                    </#if>
+
+                                    <#list 1..deviceInfos.getTotalPages() as index>
+                                        <#if currentPage == index>
+                                            <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
+                                            </li>
+                                        <#else>
+                                            <li class="page-item ">
+                                                <a class="page-link"
+                                                   href="${req.contextPath}/backstage_device/list?page=${index}&size=${size}">${index}</a>
+                                            </li>
+                                        </#if>
+                                    </#list>
+
+                                    <#if currentPage gte deviceInfos.getTotalPages()>
+                                        <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+                                    <#else>
+                                        <li class="page-item ">
+                                            <a class="page-link"
+                                               href="${req.contextPath}/backstage_device/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                        </li>
+                                    </#if>
+                                </ul>
+                            </nav>
+
+                        </div>
+                    </div>
+                </#if>
+<#--                &lt;#&ndash;分页&ndash;&gt;-->
+<#--                <#if deviceUuid??>-->
+<#--                <#else >-->
+<#--                    <div class="col-md-12 column">-->
+<#--                        <ul class="pagination pull-right">-->
+<#--                            <#if currentPage lte 1>-->
+<#--                                <li class="disabled"><a href="#">上一页</a></li>-->
+<#--                            <#else>-->
+<#--                                <li>-->
+<#--                                    <a href="${req.contextPath}/backstage_device/list?page=${currentPage - 1}&size=${size}">上一页</a>-->
+<#--                                </li>-->
+<#--                            </#if>-->
+
+<#--                            <#list 1..deviceInfos.getTotalPages() as index>-->
+<#--                                <#if currentPage == index>-->
+<#--                                    <li class="disabled"><a href="#">${index}</a></li>-->
+<#--                                <#else>-->
+<#--                                    <li>-->
+<#--                                        <a href="${req.contextPath}/backstage_device/list?page=${index}&size=${size}">${index}</a>-->
+<#--                                    </li>-->
+<#--                                </#if>-->
+<#--                            </#list>-->
+
+<#--                            <#if currentPage gte deviceInfos.getTotalPages()>-->
+<#--                                <li class="disabled"><a href="#">下一页</a></li>-->
+<#--                            <#else>-->
+<#--                                <li>-->
+<#--                                    <a href="${req.contextPath}/backstage_device/list?page=${currentPage + 1}&size=${size}">下一页</a>-->
+<#--                                </li>-->
+<#--                            </#if>-->
+<#--                        </ul>-->
+<#--                    </div>-->
+
+<#--                </#if>-->
+            </div>
+
+        </div>
+    </div>
+</div>
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+</body>
+</html>

src/main/resources/templates/device/list.ftl

@@ -14,215 +14,205 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "设备二维码列表">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
-        <div class="section-body">
-            <div class="container-fluid">
+    <div style="height: 10px;"></div>
+    <div class="container-fluid">
+        <div class="row clearfix">
+            <div class="col-md-12 ">
+                <div class="card">
+                    <div class="card-header">
+                        <h3 class="card-title">设备uuid</h3>
+                    </div>
+                    <div class="card-body">
+                        <form role="form" name="nickForm" method="post"
+                              action="${req.contextPath}/backstage_device/searchDeviceInfo">
+
+                            <div class="input-group mb-3 ">
+                                <input type="text" class="form-control" name="deviceUuid"
+                                       value="${(deviceUuid)!''}"/>
+
+                                <#if deviceUuid??>
+                                    <label>当前页数</label>
+                                    <input type="text" name="page" value="${currentPage}">
+                                    <input hidden type="text" name="size" value="${size}">
+                                </#if>
+                                <div class="input-group-append">
+                                    <button type="submit" class="btn btn-primary">查询</button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
                 <div class="row clearfix">
                     <div class="col-md-12 ">
                         <div class="card">
                             <div class="card-header">
-                                <h3 class="card-title">设备uuid</h3>
+                                <h3>
+                                    设备列表
+                                </h3>
                             </div>
                             <div class="card-body">
-                                <form role="form" name="nickForm" method="post"
-                                      action="${req.contextPath}/backstage_device/searchDeviceInfo">
-
-                                    <div class="input-group mb-3 ">
-                                        <input type="text" class="form-control" name="deviceUuid"
-                                               value="${(deviceUuid)!''}"/>
-
-                                        <#if deviceUuid??>
-                                            <label>当前页数</label>
-                                            <input type="text" name="page" value="${currentPage}">
-                                            <input hidden type="text" name="size" value="${size}">
-                                        </#if>
-                                        <div class="input-group-append">
-                                            <button type="submit" class="btn btn-primary">查询</button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-                        <div class="row clearfix">
-                            <div class="col-md-12 ">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>
-                                            设备列表
-                                        </h3>
-                                    </div>
-                                    <div class="card-body">
-                                        <table class="table table-bordered table-hover">
-                                            <thead>
-                                            <tr>
-                                                <th>
-                                                    设备id
-                                                </th>
-                                                <th>
-                                                    绑定的用户id
-                                                </th>
-                                                <th>
-                                                    设备的uuid
-                                                </th>
-                                                <th>
-                                                    设备状态
-                                                </th>
-                                                <th>
-                                                    设备类型
-                                                </th>
-
-                                                <th>设备标识</th>
-
-                                                <#--                            <th>详情</th>-->
-
-                                            </tr>
-                                            </thead>
-                                            <tbody>
-
-                                            <#list deviceInfos.content as item>
-                                                <tr>
-
-                                                    <td>
-                                                        ${item.deviceId}
-                                                    </td>
-                                                    <td>
-                                                        ${(item.userId)!''}
-                                                    </td>
-                                                    <td>
-                                                        ${item.deviceUuid}
-                                                    </td>
-                                                    <td>
-                                                        <#if item.deviceStatus == 1>
-                                                            <a style="color: red">
-                                                                已绑定
-                                                            </a>
-                                                        <#else >
-                                                            <a style="color: gray">
-                                                                未绑定
-                                                            </a>
-                                                        </#if>
-                                                    </td>
-                                                    <td>
-                                                        <#if item.deviceType == 1>
-                                                            <a style="color: red">
-                                                                拳击柱
-                                                            </a>
-                                                        <#elseif item.deviceType == 2>
-                                                            <a style="color: gray">
-                                                                蹦床
-                                                            </a>
-                                                        </#if>
-                                                    </td>
-                                                    <td>
-                                                        ${item.identifier}
-                                                    </td>
-                                                    <#--                                <td>-->
-                                                    <#--                                    <a href=""-->
-                                                    <#--                                       class="btn btn-default btn-primary"-->
-                                                    <#--                                    >详情</a>-->
-                                                    <#--                                </td>-->
-
-                                                </tr>
-                                            </#list>
-
-
-                                            </tbody>
-                                        </table>
-
-                                    </div>
-                                </div>
+                                <table class="table table-bordered table-hover">
+                                    <thead>
+                                    <tr>
+                                        <th>
+                                            设备id
+                                        </th>
+                                        <th>
+                                            绑定的用户id
+                                        </th>
+                                        <th>
+                                            设备的uuid
+                                        </th>
+                                        <th>
+                                            设备状态
+                                        </th>
+                                        <th>
+                                            设备类型
+                                        </th>
+
+                                        <th>设备标识</th>
+
+                                        <#--                            <th>详情</th>-->
+
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+
+                                    <#list deviceInfos.content as item>
+                                        <tr>
+
+                                            <td>
+                                                ${item.deviceId}
+                                            </td>
+                                            <td>
+                                                ${(item.userId)!''}
+                                            </td>
+                                            <td>
+                                                ${item.deviceUuid}
+                                            </td>
+                                            <td>
+                                                <#if item.deviceStatus == 1>
+                                                    <a style="color: red">
+                                                        已绑定
+                                                    </a>
+                                                <#else >
+                                                    <a style="color: gray">
+                                                        未绑定
+                                                    </a>
+                                                </#if>
+                                            </td>
+                                            <td>
+                                                <#if item.deviceType == 1>
+                                                    <a style="color: red">
+                                                        拳击柱
+                                                    </a>
+                                                <#elseif item.deviceType == 2>
+                                                    <a style="color: gray">
+                                                        蹦床
+                                                    </a>
+                                                </#if>
+                                            </td>
+                                            <td>
+                                                ${item.identifier}
+                                            </td>
+                                            <#--                                <td>-->
+                                            <#--                                    <a href=""-->
+                                            <#--                                       class="btn btn-default btn-primary"-->
+                                            <#--                                    >详情</a>-->
+                                            <#--                                </td>-->
+
+                                        </tr>
+                                    </#list>
+
+
+                                    </tbody>
+                                </table>
 
                             </div>
                         </div>
 
                     </div>
                 </div>
-                <#--分页-->
-                <#if deviceUuid??>
-                <#else >
-                    <div class="row clearfix">
-                        <div class="col-md-12 ">
-                            <nav aria-label="Page navigation example">
-                                <ul class="pagination pull-right">
-                                    <#if currentPage lte 1>
-                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
-                                    <#else>
-                                        <li class="page-item ">
-                                            <a class="page-link" href="${req.contextPath}/backstage_device/list?page=${currentPage - 1}&size=${size}">上一页</a>
-                                        </li>
-                                    </#if>
-
-                                    <#list 1..deviceInfos.getTotalPages() as index>
-                                        <#if currentPage == index>
-                                            <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
-                                            </li>
-                                        <#else>
-                                            <li class="page-item ">
-                                                <a class="page-link"
-                                                   href="${req.contextPath}/backstage_device/list?page=${index}&size=${size}">${index}</a>
-                                            </li>
-                                        </#if>
-                                    </#list>
-
-                                    <#if currentPage gte deviceInfos.getTotalPages()>
-                                        <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
-                                    <#else>
-                                        <li class="page-item ">
-                                            <a class="page-link"
-                                               href="${req.contextPath}/backstage_device/list?page=${currentPage + 1}&size=${size}">下一页</a>
-                                        </li>
-                                    </#if>
-                                </ul>
-                            </nav>
 
-                        </div>
-                    </div>
-                </#if>
-<#--                &lt;#&ndash;分页&ndash;&gt;-->
-<#--                <#if deviceUuid??>-->
-<#--                <#else >-->
-<#--                    <div class="col-md-12 column">-->
-<#--                        <ul class="pagination pull-right">-->
-<#--                            <#if currentPage lte 1>-->
-<#--                                <li class="disabled"><a href="#">上一页</a></li>-->
-<#--                            <#else>-->
-<#--                                <li>-->
-<#--                                    <a href="${req.contextPath}/backstage_device/list?page=${currentPage - 1}&size=${size}">上一页</a>-->
-<#--                                </li>-->
-<#--                            </#if>-->
-
-<#--                            <#list 1..deviceInfos.getTotalPages() as index>-->
-<#--                                <#if currentPage == index>-->
-<#--                                    <li class="disabled"><a href="#">${index}</a></li>-->
-<#--                                <#else>-->
-<#--                                    <li>-->
-<#--                                        <a href="${req.contextPath}/backstage_device/list?page=${index}&size=${size}">${index}</a>-->
-<#--                                    </li>-->
-<#--                                </#if>-->
-<#--                            </#list>-->
-
-<#--                            <#if currentPage gte deviceInfos.getTotalPages()>-->
-<#--                                <li class="disabled"><a href="#">下一页</a></li>-->
-<#--                            <#else>-->
-<#--                                <li>-->
-<#--                                    <a href="${req.contextPath}/backstage_device/list?page=${currentPage + 1}&size=${size}">下一页</a>-->
-<#--                                </li>-->
-<#--                            </#if>-->
-<#--                        </ul>-->
-<#--                    </div>-->
-
-<#--                </#if>-->
             </div>
-
         </div>
+        <#--分页-->
+        <#if deviceUuid??>
+        <#else >
+            <div class="row clearfix">
+                <div class="col-md-12 ">
+                    <nav aria-label="Page navigation example">
+                        <ul class="pagination pull-right">
+                            <#if currentPage lte 1>
+                                <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
+                            <#else>
+                                <li class="page-item ">
+                                    <a class="page-link" href="${req.contextPath}/backstage_device/list?page=${currentPage - 1}&size=${size}">上一页</a>
+                                </li>
+                            </#if>
+
+                            <#list 1..deviceInfos.getTotalPages() as index>
+                                <#if currentPage == index>
+                                    <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
+                                    </li>
+                                <#else>
+                                    <li class="page-item ">
+                                        <a class="page-link"
+                                           href="${req.contextPath}/backstage_device/list?page=${index}&size=${size}">${index}</a>
+                                    </li>
+                                </#if>
+                            </#list>
+
+                            <#if currentPage gte deviceInfos.getTotalPages()>
+                                <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+                            <#else>
+                                <li class="page-item ">
+                                    <a class="page-link"
+                                       href="${req.contextPath}/backstage_device/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                </li>
+                            </#if>
+                        </ul>
+                    </nav>
+
+                </div>
+            </div>
+        </#if>
+        <#--                &lt;#&ndash;分页&ndash;&gt;-->
+        <#--                <#if deviceUuid??>-->
+        <#--                <#else >-->
+        <#--                    <div class="col-md-12 column">-->
+        <#--                        <ul class="pagination pull-right">-->
+        <#--                            <#if currentPage lte 1>-->
+        <#--                                <li class="disabled"><a href="#">上一页</a></li>-->
+        <#--                            <#else>-->
+        <#--                                <li>-->
+        <#--                                    <a href="${req.contextPath}/backstage_device/list?page=${currentPage - 1}&size=${size}">上一页</a>-->
+        <#--                                </li>-->
+        <#--                            </#if>-->
+
+        <#--                            <#list 1..deviceInfos.getTotalPages() as index>-->
+        <#--                                <#if currentPage == index>-->
+        <#--                                    <li class="disabled"><a href="#">${index}</a></li>-->
+        <#--                                <#else>-->
+        <#--                                    <li>-->
+        <#--                                        <a href="${req.contextPath}/backstage_device/list?page=${index}&size=${size}">${index}</a>-->
+        <#--                                    </li>-->
+        <#--                                </#if>-->
+        <#--                            </#list>-->
+
+        <#--                            <#if currentPage gte deviceInfos.getTotalPages()>-->
+        <#--                                <li class="disabled"><a href="#">下一页</a></li>-->
+        <#--                            <#else>-->
+        <#--                                <li>-->
+        <#--                                    <a href="${req.contextPath}/backstage_device/list?page=${currentPage + 1}&size=${size}">下一页</a>-->
+        <#--                                </li>-->
+        <#--                            </#if>-->
+        <#--                        </ul>-->
+        <#--                    </div>-->
+
+        <#--                </#if>-->
     </div>
+
 </div>
 <!-- jQuery and bootstrtap js -->
 <script src="../main-bundles/lib.vendor.bundle.js"></script>

src/main/resources/templates/fileManagement/fileManagement.ftl

@@ -69,7 +69,7 @@
             </li>
 
             <li>
-                <a href="${req.contextPath}/backstage_user/list"><i class="fa fa-fw icon-home"></i> 主页</a>
+                <a href="${req.contextPath}/backstage_manager/index"><i class="fa fa-fw icon-home"></i> 主页</a>
             </li>
 
             <li>

src/main/resources/templates/game/detail.ftl

@@ -41,196 +41,190 @@
 <!-- Start main html -->
 <div id="main_content">
 
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-
-        <#if gameInfo.gameId??>
-            <#assign title = "修改游戏信息">
-        <#else >
-            <#assign title = "创建新的游戏">
-        </#if>
-
-        <#include "../common/pageTop.ftl">
-
-        <#--主要内容content-->
-        <div class="section-body">
-            <div class="container-fluid">
-                <div class="row clearfix">
-                    <div class="col-md-12">
-                        <div class="card">
-                            <div class="card-body">
-                                <form name="formBasic" id="formBasic" role="form" method="post"
-                                      enctype="multipart/form-data"
-                                      action="">
-                                    <div class="form-group">
-                                        <label>游戏名称</label>
-                                        <input name="gameName" type="text" placeholder="输入游戏名称" class="form-control"
-                                               value="${(gameInfo.gameName)!''}"/>
+    <#--<div class="page">-->
+    <#--    <#if gameInfo.gameId??>-->
+    <#--        <#assign title = "修改游戏信息">-->
+    <#--    <#else >-->
+    <#--        <#assign title = "创建新的游戏">-->
+    <#--    </#if>-->
+    <#--    <#include "../common/pageTop.ftl">-->
+    <#--</div>-->
+    <div style="height: 10px;"></div>
+    <#--主要内容content-->
+    <div class="section-body">
+        <div class="container-fluid">
+            <div class="row clearfix">
+                <div class="col-md-12">
+                    <div class="card">
+                        <div class="card-body">
+                            <form name="formBasic" id="formBasic" role="form" method="post"
+                                  enctype="multipart/form-data"
+                                  action="">
+                                <div class="form-group">
+                                    <label>游戏名称</label>
+                                    <input name="gameName" type="text" placeholder="输入游戏名称" class="form-control"
+                                           value="${(gameInfo.gameName)!''}"/>
+                                </div>
+                                <div class="form-group">
+                                    <#--                                        <label>游戏创建时间</label>-->
+                                    <#--                                        <div class="input-group">-->
+                                    <#--                                            <input autocomplete="off" name="createTime" data-date-format="yyyy-mm-dd" value="${(gameInfo.createTime?string('yyyy-MM-dd'))!}" placeholder="输入游戏创建时间" data-provide="datepicker"-->
+                                    <#--                                                   data-date-autoclose="true" class="form-control date-picker">-->
+                                    <#--                                        </div>-->
+                                    <label>游戏显示时间</label>
+                                    <div class="input-group">
+                                        <input autocomplete="off" name="showTime" data-date-format="yyyy-mm-dd" value="${(gameInfo.showTime?string('yyyy-MM-dd'))!}" placeholder="输入游戏创建时间" data-provide="datepicker"
+                                               data-date-autoclose="true" class="form-control date-picker">
                                     </div>
-                                    <div class="form-group">
-<#--                                        <label>游戏创建时间</label>-->
-<#--                                        <div class="input-group">-->
-<#--                                            <input autocomplete="off" name="createTime" data-date-format="yyyy-mm-dd" value="${(gameInfo.createTime?string('yyyy-MM-dd'))!}" placeholder="输入游戏创建时间" data-provide="datepicker"-->
-<#--                                                   data-date-autoclose="true" class="form-control date-picker">-->
-<#--                                        </div>-->
-                                        <label>游戏显示时间</label>
-                                        <div class="input-group">
-                                            <input autocomplete="off" name="showTime" data-date-format="yyyy-mm-dd" value="${(gameInfo.showTime?string('yyyy-MM-dd'))!}" placeholder="输入游戏创建时间" data-provide="datepicker"
-                                                   data-date-autoclose="true" class="form-control date-picker">
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label>游戏状态(1.上线，0.下线)</label>
-                                        <select name="gameStatus" class="form-control">
-                                            <option <#if (gameInfo.gameStatus)?? && gameInfo.gameStatus == 1>
-                                                selected
-                                            </#if> value=1>上线
+                                </div>
+                                <div class="form-group">
+                                    <label>游戏状态(1.上线，0.下线)</label>
+                                    <select name="gameStatus" class="form-control">
+                                        <option <#if (gameInfo.gameStatus)?? && gameInfo.gameStatus == 1>
+                                            selected
+                                        </#if> value=1>上线
+                                        </option>
+                                        <option <#if (gameInfo.gameStatus)?? && gameInfo.gameStatus == 0>
+                                            selected
+                                        </#if> value=0>下线
+                                        </option>
+                                    </select>
+                                    <#--<input name="gameStatus" type="number" class="form-control" value="${(gameInfo.gameStatus)!''}"/>-->
+                                </div>
+
+                                <div class="form-group">
+                                    <label>游戏所属分类</label>
+                                    <select name="gameType" class="form-control">
+                                        <#list categoryList as category>
+                                            <option value="${category.categoryType}"
+                                                    <#if (gameInfo.gameType)?? && gameInfo.gameType == category.categoryType>
+                                                        selected
+                                                    </#if>
+                                            >${category.categoryName}
                                             </option>
-                                            <option <#if (gameInfo.gameStatus)?? && gameInfo.gameStatus == 0>
-                                                selected
-                                            </#if> value=0>下线
-                                            </option>
-                                        </select>
-                                        <#--<input name="gameStatus" type="number" class="form-control" value="${(gameInfo.gameStatus)!''}"/>-->
-                                    </div>
-
-                                    <div class="form-group">
-                                        <label>游戏所属分类</label>
-                                        <select name="gameType" class="form-control">
-                                            <#list categoryList as category>
-                                                <option value="${category.categoryType}"
-                                                        <#if (gameInfo.gameType)?? && gameInfo.gameType == category.categoryType>
+                                        </#list>
+                                    </select>
+                                </div>
+                                <div class="form-group">
+                                    <label>游戏支持展示的平台(0:Android,1:IOS,2:同时支持两个平台)</label>
+                                    <select name="platform" class="form-control">
+                                        <option <#if (gameInfo.platform)?? && gameInfo.platform == 0>
+                                            selected
+                                        </#if> value=0>Android
+                                        </option>
+                                        <option <#if (gameInfo.platform)?? && gameInfo.platform == 1>
+                                            selected
+                                        </#if> value=1>IOS
+                                        </option>
+                                        <option <#if (gameInfo.platform)?? && gameInfo.platform == 2>
+                                            selected
+                                        </#if> value=2>同时支持两个平台
+                                        </option>
+                                    </select>
+                                    <#--<input name="gameStatus" type="number" class="form-control" value="${(gameInfo.gameStatus)!''}"/>-->
+                                </div>
+                                <div class="form-group">
+                                    <label>游戏模式标签类型(可多选)</label>
+                                    <br/>
+                                    <div class="form-group multiselect_div">
+                                        <select id="multiselect-color2" name="multiselectTag" class="multiselect multiselect-custom" multiple="multiple">
+                                            <#--                                                <option value="shadai">沙袋</option>-->
+                                            <#--                                                <option value="hostman">Hostman</option>-->
+                                            <#--                                                <option value="shoubing">手柄</option>-->
+                                            <#list allCustomTags as tag>
+                                                <option value="${tag.tagId}"
+                                                        <#if tag.tagSelect>
                                                             selected
                                                         </#if>
-                                                >${category.categoryName}
+                                                >${tag.tagName}
                                                 </option>
                                             </#list>
+
                                         </select>
                                     </div>
-                                    <div class="form-group">
-                                        <label>游戏支持展示的平台(0:Android,1:IOS,2:同时支持两个平台)</label>
-                                        <select name="platform" class="form-control">
-                                            <option <#if (gameInfo.platform)?? && gameInfo.platform == 0>
-                                                selected
-                                            </#if> value=0>Android
-                                            </option>
-                                            <option <#if (gameInfo.platform)?? && gameInfo.platform == 1>
-                                                selected
-                                            </#if> value=1>IOS
-                                            </option>
-                                            <option <#if (gameInfo.platform)?? && gameInfo.platform == 2>
-                                                selected
-                                            </#if> value=2>同时支持两个平台
-                                            </option>
-                                        </select>
-                                        <#--<input name="gameStatus" type="number" class="form-control" value="${(gameInfo.gameStatus)!''}"/>-->
-                                    </div>
-                                    <div class="form-group">
-                                        <label>游戏模式标签类型(可多选)</label>
-                                        <br/>
-                                        <div class="form-group multiselect_div">
-                                            <select id="multiselect-color2" name="multiselectTag" class="multiselect multiselect-custom" multiple="multiple">
-<#--                                                <option value="shadai">沙袋</option>-->
-<#--                                                <option value="hostman">Hostman</option>-->
-<#--                                                <option value="shoubing">手柄</option>-->
-                                                <#list allCustomTags as tag>
-                                                    <option value="${tag.tagId}"
-                                                            <#if tag.tagSelect>
-                                                                selected
-                                                            </#if>
-                                                    >${tag.tagName}
-                                                    </option>
-                                                </#list>
-
-                                            </select>
-                                        </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label>游戏简介</label>
+                                    <input name="gameDescription" type="text" placeholder="输入游戏描述信息" class="form-control"
+                                           value="${(gameInfo.gameDescription)!''}"/>
+                                </div>
+                                <#--https://www.yuyekeji.cn/Cocos/BoxingTutorial/ -->
+                                <div class="form-group">
+                                    <label for="basic-url">游戏地址</label>
+                                    <div class="input-group mb-3">
+                                        <#--                                            <div class="input-group-prepend">-->
+                                        <#--                                            <span class="input-group-text"-->
+                                        <#--                                                  id="basic-addon3">https://www.yuyekeji.cn/Cocos/</span>-->
+                                        <#--                                            </div>-->
+                                        <input name="gameWebUrl" type="text" class="form-control"
+                                               value="${(gameInfo.gameWebUrl)!}"
+                                               aria-describedby="basic-addon3">
                                     </div>
-
-                                    <div class="form-group">
-                                        <label>游戏简介</label>
-                                        <input name="gameDescription" type="text" placeholder="输入游戏描述信息" class="form-control"
-                                               value="${(gameInfo.gameDescription)!''}"/>
+                                </div>
+
+                                <#--                                    <div class="form-group">-->
+                                <#--                                        <label>游戏地址</label>-->
+                                <#--                                        <input name="gameWebUrl" type="text" class="form-control"-->
+                                <#--                                               value="${(gameInfo.gameWebUrl)!''}"/>-->
+                                <#--                                    </div>-->
+                                <#--                        hidden-->
+                                <input hidden class="gameId" type="text" name="gameId"
+                                       value="${(gameInfo.gameId)!''}">
+
+                                <#--  id="createGameButton" -->
+                                <#if (showPicture)??>
+                                    <h3>gameid</h3>
+                                </#if>
+                                <div class="form-group">
+                                    <div class="kv-avatar-hint">
+                                        <label>选择图片作为图标(小于200KB)</label>
                                     </div>
-                                    <#--https://www.yuyekeji.cn/Cocos/BoxingTutorial/ -->
-                                    <div class="form-group">
-                                        <label for="basic-url">游戏地址</label>
-                                        <div class="input-group mb-3">
-<#--                                            <div class="input-group-prepend">-->
-<#--                                            <span class="input-group-text"-->
-<#--                                                  id="basic-addon3">https://www.yuyekeji.cn/Cocos/</span>-->
-<#--                                            </div>-->
-                                            <input name="gameWebUrl" type="text" class="form-control"
-                                                   value="${(gameInfo.gameWebUrl)!}"
-                                                   aria-describedby="basic-addon3">
+                                    <div class="kv-avatar">
+                                        <div class="file-loading">
+                                            <input id="icon" name="icon" type="file">
                                         </div>
                                     </div>
-
-                                    <#--                                    <div class="form-group">-->
-                                    <#--                                        <label>游戏地址</label>-->
-                                    <#--                                        <input name="gameWebUrl" type="text" class="form-control"-->
-                                    <#--                                               value="${(gameInfo.gameWebUrl)!''}"/>-->
-                                    <#--                                    </div>-->
-                                    <#--                        hidden-->
-                                    <input hidden class="gameId" type="text" name="gameId"
-                                           value="${(gameInfo.gameId)!''}">
-
-                                    <#--  id="createGameButton" -->
-                                    <#if (showPicture)??>
-                                        <h3>gameid</h3>
-                                    </#if>
-                                    <div class="form-group">
-                                        <div class="kv-avatar-hint">
-                                            <label>选择图片作为图标(小于200KB)</label>
-                                        </div>
-                                        <div class="kv-avatar">
-                                            <div class="file-loading">
-                                                <input id="icon" name="icon" type="file">
-                                            </div>
-                                        </div>
-<#--                                        <div class="kv-avatar-hint">-->
-<#--                                            <small>Select file < 1500 KB</small>-->
-<#--                                        </div>-->
+                                    <#--                                        <div class="kv-avatar-hint">-->
+                                    <#--                                            <small>Select file < 1500 KB</small>-->
+                                    <#--                                        </div>-->
+                                </div>
+                                <div class="form-group">
+                                    <div class="kv-avatar-hint">
+                                        <label>选择图片作为封面(小于200KB)</label>
                                     </div>
-                                    <div class="form-group">
-                                        <div class="kv-avatar-hint">
-                                            <label>选择图片作为封面(小于200KB)</label>
-                                        </div>
-                                        <div class="kv-avatar">
-                                            <div class="file-loading">
-                                                <input id="cover" name="cover" type="file">
-                                            </div>
+                                    <div class="kv-avatar">
+                                        <div class="file-loading">
+                                            <input id="cover" name="cover" type="file">
                                         </div>
                                     </div>
-                                    <div class="form-group">
-                                        <div class="kv-avatar-hint">
-                                            <label>选择多张图片作为轮播图(小于500KB)</label>
-                                        </div>
-                                        <div>
-                                            <div class="file-loading">
-                                                <input id="scroll" name="scroll" type="file" multiple>
-                                            </div>
+                                </div>
+                                <div class="form-group">
+                                    <div class="kv-avatar-hint">
+                                        <label>选择多张图片作为轮播图(小于500KB)</label>
+                                    </div>
+                                    <div>
+                                        <div class="file-loading">
+                                            <input id="scroll" name="scroll" type="file" multiple>
                                         </div>
                                     </div>
+                                </div>
 
-                                    <button type="submit" class="btn btn-block btn-primary">
-                                        <#if gameInfo.gameId??>
-                                            提交修改
-                                        <#else >
-                                            创建游戏
-                                        </#if>
-                                    </button>
-
-                                </form>
-
-                            </div>
+                                <button type="submit" class="btn btn-block btn-primary">
+                                    <#if gameInfo.gameId??>
+                                        提交修改
+                                    <#else >
+                                        创建游戏
+                                    </#if>
+                                </button>
 
+                            </form>
 
                         </div>
 
+
                     </div>
+
                 </div>
             </div>
         </div>

src/main/resources/templates/game/list-copy.ftl

@@ -0,0 +1,447 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <#include "../common/header.ftl">
+    <#setting number_format="#">
+
+</head>
+<body class="font-opensans  sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "游戏列表">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+
+        <#--    主要内容content-->
+        <div class="section-body">
+            <div class="container-fluid">
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <div class="card">
+                            <div class="card-header">
+                                <a href="${req.contextPath}/backstage_game/add"
+                                   class="btn  btn-primary" style="margin-bottom: 10px;"
+                                >添加新的游戏
+                                </a>
+                            </div>
+                            <div class="card-body">
+                                <table class="table table-bordered table-hover">
+                                    <thead>
+                                    <tr>
+                                        <th>
+                                            游戏id
+                                        </th>
+                                        <th>
+                                            图标
+                                        </th>
+                                        <th>
+                                            说明图
+                                        </th>
+                                        <th>
+                                            游戏名称
+                                        </th>
+                                        <th>
+                                            游戏状态
+                                        </th>
+                                        <th>
+                                            游戏类型
+                                        </th>
+
+                                        <th>url地址</th>
+
+                                        <th>详情</th>
+
+                                        <th>可显示时间</th>
+
+                                        <th>推荐到列表</th>
+
+                                        <th>是否删除游戏</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+
+                                    <#list gameInfos.content as item>
+                                        <tr>
+
+                                            <td>
+                                                ${item.gameId}
+                                            </td>
+                                            <td>
+                                                <img class="img-rounded " alt="" width="50" height="50"
+                                                     src="${(item.gameIcon)!''}"/>
+                                            </td>
+                                            <td>
+                                                <img class="img-rounded " alt="" width="50" height="50"
+                                                     src="${(item.gamePicture)!''}"/>
+                                            </td>
+                                            <td>
+                                                ${item.gameName}
+                                            </td>
+                                            <td>
+                                                <#if (item.gameStatus)?? && item.gameStatus == 1>
+                                                    <a style="color: red;">上线</a>
+                                                </#if>
+                                                <#if (item.gameStatus)?? && item.gameStatus == 0>
+                                                    <a>下线</a>
+                                                </#if>
+                                            </td>
+                                            <td>
+                                                <#list categoryList as category>
+                                                    <#if (item.gameType)?? && item.gameType == category.categoryType>
+                                                        ${category.categoryName}
+                                                    </#if>
+                                                </#list>
+                                            </td>
+                                            <td>
+                                                ${(item.gameWebUrl)!''}
+                                            </td>
+                                            <td>
+                                                <a href="${req.contextPath}/backstage_game/detail?gameId=${item.gameId}"
+                                                   class="btn btn-primary"
+                                                >详情</a>
+                                            </td>
+
+                                            <td>
+                                                ${(item.showTime?string('yyyy-MM-dd'))!''}
+                                            </td>
+
+                                            <td>
+                                                <#if (item.gameStatus)?? && item.gameStatus == 1>
+                                                    <button data-target="#modal-container-481574" role="button"
+                                                            class="btn btn-primary"
+                                                            data-toggle="modal" data-type="add_recommend_game"
+                                                            data-name="${item.gameName}"
+                                                            data-game-id="${item.gameId}"
+                                                            data-game-type="${item.gameType}"
+                                                            data-end-time="${item.createTime}"
+                                                            data-show-time="${item.showTime}">推荐
+                                                    </button>
+                                                </#if>
+                                            </td>
+
+                                            <td>
+                                                <button data-target="#modal-container-481574" role="button"
+                                                        class="btn btn-danger"
+                                                        data-toggle="modal" data-type="delete_game"
+                                                        data-name="${item.gameName}"
+                                                        data-game-id="${item.gameId}"
+                                                        data-game-type="${item.gameType}"
+                                                        data-end-time="${item.createTime}"
+                                                        data-show-time="${item.showTime}">删除
+                                                </button>
+                                            </td>
+                                        </tr>
+                                    </#list>
+
+
+                                    </tbody>
+                                </table>
+
+                            </div>
+                        </div>
+
+                        <div class="modal fade" id="modal-container-481574" role="dialog" aria-labelledby="myModalLabel"
+                             aria-hidden="true">
+                            <div class="modal-dialog">
+                                <div class="modal-content">
+                                    <div class="modal-header">
+                                        <h4 class="modal-title" id="myModalLabel">提示</h4>
+                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
+                                        </button>
+                                    </div>
+                                    <!--Form的id为myForm-->
+                                    <form id="myForm" method="POST" action="">
+                                        <div class="modal-body">
+                                            是否删除游戏
+                                        </div>
+                                        <input type="hidden" class="gameId" name="gameId">
+                                        <input type="hidden" class="gameType" name="gameType">
+                                        <input type="hidden" class="endTime" name="endTime">
+                                        <input type="hidden" class="showTime" name="showTime">
+                                        <div class="modal-footer">
+                                            <button type="button" class="btn btn-default" data-dismiss="modal">关闭
+                                            </button>
+                                            <button type="submit" id="submitConfirm" class="btn btn-primary">确定</button>
+                                        </div>
+                                    </form>
+                                </div>
+
+                            </div>
+
+                        </div>
+
+                    </div>
+
+
+                </div>
+                <#--分页-->
+                <#if nickname??>
+                <#else >
+                    <div class="row clearfix">
+                        <div class="col-md-12 ">
+                            <nav aria-label="Page navigation example">
+                                <ul class="pagination pull-right">
+                                    <#if currentPage lte 1>
+                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
+                                    <#else>
+                                        <li class="page-item ">
+                                            <a class="page-link" href="${req.contextPath}/backstage_game/list?page=${currentPage - 1}&size=${size}">上一页</a>
+                                        </li>
+                                    </#if>
+
+                                    <#list 1..gameInfos.getTotalPages() as index>
+                                        <#if currentPage == index>
+                                            <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
+                                            </li>
+                                        <#else>
+                                            <li class="page-item ">
+                                                <a class="page-link"
+                                                   href="${req.contextPath}/backstage_game/list?page=${index}&size=${size}">${index}</a>
+                                            </li>
+                                        </#if>
+                                    </#list>
+
+                                    <#if currentPage gte gameInfos.getTotalPages()>
+                                        <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+                                    <#else>
+                                        <li class="page-item ">
+                                            <a class="page-link"
+                                               href="${req.contextPath}/backstage_game/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                        </li>
+                                    </#if>
+                                </ul>
+                            </nav>
+
+                        </div>
+                    </div>
+                </#if>
+
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <div class="card">
+                            <div class="card-body">
+                                <ul class="nav nav-tabs b-none">
+                                    <li class="nav-item"><a class="nav-link active" data-toggle="tab"
+                                                            href="#game-tab"><i class="fa fa-list-ul"></i>推荐的游戏</a>
+                                    </li>
+                                    <li class="nav-item"><a class="nav-link" data-toggle="tab"
+                                                            href="#video-tab"><i class="fa fa-list-ul"></i>推荐的视频</a>
+                                    </li>
+                                </ul>
+                            </div>
+                            <div class="card-body">
+                                <div class="tab-content">
+                                    <div class="tab-pane fade active show" id="game-tab">
+                                        <div class="row clearfix">
+                                            <div class="col-12">
+                                                <div class="card-group mb-4">
+                                                    <#if gameRecommend??>
+                                                        <#list gameRecommend as item>
+                                                            <div class="col-lg-3 col-md-6">
+                                                                <div class="card">
+                                                                    <div class="card-img-top" style="background-color: black;">
+                                                                        <img style="height: 200px;clear: both;display: block;margin: auto;"
+                                                                             src="${(item.gameIcon)!''}"
+                                                                             alt="Card image cap">
+                                                                    </div>
+                                                                    <div class="card-body">
+                                                                        <h5 class="card-title">${item.gameName}</h5>
+                                                                        <p class="card-text">${item.gameDescription}</p>
+                                                                        <p class="card-text"><small
+                                                                                    class="text-muted">${(item.createTime?string('yyyy-MM-dd'))!''}</small>
+                                                                        </p>
+                                                                        <button data-target="#modal-container-481574"
+                                                                                role="button"
+                                                                                class="btn btn-primary"
+                                                                                data-toggle="modal"
+                                                                                data-type="delete_recommend_game"
+                                                                                data-name="${item.gameName}"
+                                                                                data-game-id="${item.gameId}">删除
+                                                                        </button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </#list>
+                                                    </#if>
+
+                                                </div>
+                                            </div>
+
+                                        </div>
+
+                                    </div>
+                                    <div class="tab-pane fade " id="video-tab">
+                                        <div class="row clearfix">
+                                            <#if videoRecommend??>
+                                                <#list videoRecommend as item>
+                                                    <div class="col-lg-3 col-md-6">
+                                                        <div class="card">
+                                                            <div class="card-img-top" style="background-color: black;">
+                                                                <img style="height: 200px;clear: both;display: block;margin: auto;"
+                                                                     src="${(item.gameIcon)!''}"
+                                                                     alt="Card image cap">
+                                                            </div>
+
+                                                            <div class="card-body">
+                                                                <h5 class="card-title">${item.gameName}</h5>
+                                                                <p class="card-text">${item.gameDescription}</p>
+                                                                <p class="card-text"><small
+                                                                            class="text-muted">${(item.createTime?string('yyyy-MM-dd'))!''}</small>
+                                                                </p>
+                                                                <button data-target="#modal-container-481574"
+                                                                        role="button"
+                                                                        class="btn btn-primary"
+                                                                        data-toggle="modal"
+                                                                        data-type="delete_recommend_game"
+                                                                        data-name="${item.gameName}"
+                                                                        data-game-id="${item.gameId}">删除
+                                                                </button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </#list>
+                                            </#if>
+                                        </div>
+
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+        </div>
+
+    </div>
+</div>
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+<script>
+    $(function () {
+        $('#modal-container-481574').modal('hide')
+    });
+</script>
+<script>
+
+    $(function () {
+        $('#modal-container-481574').on('show.bs.modal', function (event) {
+            var _target = $(event.relatedTarget);
+
+            var _type = _target.data('type');
+
+            var _name = _target.data('name');
+            var _id = _target.data('gameId');
+            var _showTime = _target.data("showTime");
+            var _endTime = _target.data("endTime");
+            var _gameType = _target.data("gameType");
+
+
+            console.log(_name, _id, _endTime, _gameType);
+            var modal = $(this);
+            if (_type == "add_recommend_game") {
+                modal.find('.modal-body').text("是否设置《 " + _name + ' 》游戏到推荐列表？').attr('content');
+
+                $('.modal-footer').html(
+                    '<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>' +
+                    '<button type="button" id="submitRecommend" class="btn btn-primary">确定</button>');
+
+                $('#submitRecommend').click(function (e) {
+                    //防止冒泡
+                    e.preventDefault();
+                    console.log("submitRecommend", e);
+
+                    gameListPost("${req.contextPath}/backstage_recommend/add");
+                });
+            } else if (_type == "delete_game") {
+                modal.find('.modal-body').text("是否删除《 " + _name + ' 》游戏？').attr('content');
+
+                $('.modal-footer').html(
+                    '<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>' +
+                    '<button type="button" id="submitDelete" class="btn btn-primary">确定</button>');
+
+                $('#submitDelete').click(function (e) {
+                    //防止冒泡
+                    e.preventDefault();
+                    console.log("submitDelete", e);
+                    gameListPost("${req.contextPath}/backstage_game/delete");
+
+                });
+            } else if (_type == "delete_recommend_game") {
+                modal.find('.modal-body').text("是否删除推荐的《 " + _name + ' 》游戏？').attr('content');
+
+                $('.modal-footer').html(
+                    '<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>' +
+                    '<button type="button" id="submitDeleteRecommendGame" class="btn btn-primary">确定</button>');
+
+                $('#submitDeleteRecommendGame').click(function (e) {
+                    //防止冒泡
+                    e.preventDefault();
+                    console.log("submitDeleteRecommendGame", e);
+                    gameListPost("${req.contextPath}/backstage_recommend/delete");
+
+                });
+            }
+            modal.find('.gameId').val(_id);
+            modal.find(".gameType").val(_gameType);
+            modal.find(".endTime").val(_endTime);
+            modal.find(".showTime").val(_showTime);
+        })
+    });
+
+</script>
+<script type="text/javascript">
+
+    function gameListPost(url) {
+        //use jqXHR.done(), jqXHR.fail(), and jqXHR.always() instead.
+        $.ajax({
+            type: "post",
+            url: url,
+            data: $('#myForm').serialize(),
+        }).done(function (message) {
+            console.log(message)
+
+            $('#modal-container-481574').modal('hide');
+            window.location.reload();
+            // $('.modal-body').text('操作成功');
+            // $('.modal-footer').html('<button type="button" class="btn btn-default" data-dismiss="modal">返回</button>');
+        }).fail(function (err) {
+            console.log(err)
+            $('.modal-body').text('操作失败，请重新选择条目，或联系管理人员');
+            $('.modal-footer').html('<button type="button" class="btn btn-default" data-dismiss="modal">返回</button>');
+
+        })
+        /*
+         或者用jquery.form.min.js提交
+         $('#registSubmit').ajaxSubmit(function(message){
+            console.log(message);
+         })
+         */
+    }
+
+    //当modal页面消失后，重新将页面刷新
+    // $(function () {
+    //     $('#modal-container-481574').on('hide.bs.modal', function () {
+    //         window.location.reload();
+    //     })
+    // });
+</script>
+
+</body>
+
+</html>

src/main/resources/templates/game/list.ftl

@@ -14,319 +14,309 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "游戏列表">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
-
-        <#--    主要内容content-->
-        <div class="section-body">
-            <div class="container-fluid">
-                <div class="row clearfix">
-                    <div class="col-md-12 ">
-                        <div class="card">
-                            <div class="card-header">
-                                <a href="${req.contextPath}/backstage_game/add"
-                                   class="btn  btn-primary" style="margin-bottom: 10px;"
-                                >添加新的游戏
-                                </a>
-                            </div>
-                            <div class="card-body">
-                                <table class="table table-bordered table-hover">
-                                    <thead>
+    <div style="height: 10px;"></div>
+    <div class="section-body">
+        <div class="container-fluid">
+            <div class="row clearfix">
+                <div class="col-md-12 ">
+                    <div class="card">
+                        <div class="card-header">
+                            <a href="${req.contextPath}/backstage_game/add"
+                               class="btn  btn-primary" style="margin-bottom: 10px;"
+                            >添加新的游戏
+                            </a>
+                        </div>
+                        <div class="card-body">
+                            <table class="table table-bordered table-hover">
+                                <thead>
+                                <tr>
+                                    <th>
+                                        游戏id
+                                    </th>
+                                    <th>
+                                        图标
+                                    </th>
+                                    <th>
+                                        说明图
+                                    </th>
+                                    <th>
+                                        游戏名称
+                                    </th>
+                                    <th>
+                                        游戏状态
+                                    </th>
+                                    <th>
+                                        游戏类型
+                                    </th>
+
+                                    <th>url地址</th>
+
+                                    <th>详情</th>
+
+                                    <th>可显示时间</th>
+
+                                    <th>推荐到列表</th>
+
+                                    <th>是否删除游戏</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+
+                                <#list gameInfos.content as item>
                                     <tr>
-                                        <th>
-                                            游戏id
-                                        </th>
-                                        <th>
-                                            图标
-                                        </th>
-                                        <th>
-                                            说明图
-                                        </th>
-                                        <th>
-                                            游戏名称
-                                        </th>
-                                        <th>
-                                            游戏状态
-                                        </th>
-                                        <th>
-                                            游戏类型
-                                        </th>
-
-                                        <th>url地址</th>
-
-                                        <th>详情</th>
-
-                                        <th>可显示时间</th>
-
-                                        <th>推荐到列表</th>
-
-                                        <th>是否删除游戏</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-
-                                    <#list gameInfos.content as item>
-                                        <tr>
-
-                                            <td>
-                                                ${item.gameId}
-                                            </td>
-                                            <td>
-                                                <img class="img-rounded " alt="" width="50" height="50"
-                                                     src="${(item.gameIcon)!''}"/>
-                                            </td>
-                                            <td>
-                                                <img class="img-rounded " alt="" width="50" height="50"
-                                                     src="${(item.gamePicture)!''}"/>
-                                            </td>
-                                            <td>
-                                                ${item.gameName}
-                                            </td>
-                                            <td>
-                                                <#if (item.gameStatus)?? && item.gameStatus == 1>
-                                                    <a style="color: red;">上线</a>
-                                                </#if>
-                                                <#if (item.gameStatus)?? && item.gameStatus == 0>
-                                                    <a>下线</a>
-                                                </#if>
-                                            </td>
-                                            <td>
-                                                <#list categoryList as category>
-                                                    <#if (item.gameType)?? && item.gameType == category.categoryType>
-                                                        ${category.categoryName}
-                                                    </#if>
-                                                </#list>
-                                            </td>
-                                            <td>
-                                                ${(item.gameWebUrl)!''}
-                                            </td>
-                                            <td>
-                                                <a href="${req.contextPath}/backstage_game/detail?gameId=${item.gameId}"
-                                                   class="btn btn-primary"
-                                                >详情</a>
-                                            </td>
-
-                                            <td>
-                                                ${(item.showTime?string('yyyy-MM-dd'))!''}
-                                            </td>
-
-                                            <td>
-                                                <#if (item.gameStatus)?? && item.gameStatus == 1>
-                                                    <button data-target="#modal-container-481574" role="button"
-                                                            class="btn btn-primary"
-                                                            data-toggle="modal" data-type="add_recommend_game"
-                                                            data-name="${item.gameName}"
-                                                            data-game-id="${item.gameId}"
-                                                            data-game-type="${item.gameType}"
-                                                            data-end-time="${item.createTime}"
-                                                            data-show-time="${item.showTime}">推荐
-                                                    </button>
-                                                </#if>
-                                            </td>
 
-                                            <td>
+                                        <td>
+                                            ${item.gameId}
+                                        </td>
+                                        <td>
+                                            <img class="img-rounded " alt="" width="50" height="50"
+                                                 src="${(item.gameIcon)!''}"/>
+                                        </td>
+                                        <td>
+                                            <img class="img-rounded " alt="" width="50" height="50"
+                                                 src="${(item.gamePicture)!''}"/>
+                                        </td>
+                                        <td>
+                                            ${item.gameName}
+                                        </td>
+                                        <td>
+                                            <#if (item.gameStatus)?? && item.gameStatus == 1>
+                                                <a style="color: red;">上线</a>
+                                            </#if>
+                                            <#if (item.gameStatus)?? && item.gameStatus == 0>
+                                                <a>下线</a>
+                                            </#if>
+                                        </td>
+                                        <td>
+                                            <#list categoryList as category>
+                                                <#if (item.gameType)?? && item.gameType == category.categoryType>
+                                                    ${category.categoryName}
+                                                </#if>
+                                            </#list>
+                                        </td>
+                                        <td>
+                                            ${(item.gameWebUrl)!''}
+                                        </td>
+                                        <td>
+                                            <a href="${req.contextPath}/backstage_game/detail?gameId=${item.gameId}"
+                                               class="btn btn-primary"
+                                            >详情</a>
+                                        </td>
+
+                                        <td>
+                                            ${(item.showTime?string('yyyy-MM-dd'))!''}
+                                        </td>
+
+                                        <td>
+                                            <#if (item.gameStatus)?? && item.gameStatus == 1>
                                                 <button data-target="#modal-container-481574" role="button"
-                                                        class="btn btn-danger"
-                                                        data-toggle="modal" data-type="delete_game"
+                                                        class="btn btn-primary"
+                                                        data-toggle="modal" data-type="add_recommend_game"
                                                         data-name="${item.gameName}"
                                                         data-game-id="${item.gameId}"
                                                         data-game-type="${item.gameType}"
                                                         data-end-time="${item.createTime}"
-                                                        data-show-time="${item.showTime}">删除
+                                                        data-show-time="${item.showTime}">推荐
                                                 </button>
-                                            </td>
-                                        </tr>
-                                    </#list>
+                                            </#if>
+                                        </td>
+
+                                        <td>
+                                            <button data-target="#modal-container-481574" role="button"
+                                                    class="btn btn-danger"
+                                                    data-toggle="modal" data-type="delete_game"
+                                                    data-name="${item.gameName}"
+                                                    data-game-id="${item.gameId}"
+                                                    data-game-type="${item.gameType}"
+                                                    data-end-time="${item.createTime}"
+                                                    data-show-time="${item.showTime}">删除
+                                            </button>
+                                        </td>
+                                    </tr>
+                                </#list>
 
 
-                                    </tbody>
-                                </table>
+                                </tbody>
+                            </table>
 
-                            </div>
                         </div>
+                    </div>
 
-                        <div class="modal fade" id="modal-container-481574" role="dialog" aria-labelledby="myModalLabel"
-                             aria-hidden="true">
-                            <div class="modal-dialog">
-                                <div class="modal-content">
-                                    <div class="modal-header">
-                                        <h4 class="modal-title" id="myModalLabel">提示</h4>
-                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
+                    <div class="modal fade" id="modal-container-481574" role="dialog" aria-labelledby="myModalLabel"
+                         aria-hidden="true">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <h4 class="modal-title" id="myModalLabel">提示</h4>
+                                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
+                                    </button>
+                                </div>
+                                <!--Form的id为myForm-->
+                                <form id="myForm" method="POST" action="">
+                                    <div class="modal-body">
+                                        是否删除游戏
+                                    </div>
+                                    <input type="hidden" class="gameId" name="gameId">
+                                    <input type="hidden" class="gameType" name="gameType">
+                                    <input type="hidden" class="endTime" name="endTime">
+                                    <input type="hidden" class="showTime" name="showTime">
+                                    <div class="modal-footer">
+                                        <button type="button" class="btn btn-default" data-dismiss="modal">关闭
                                         </button>
+                                        <button type="submit" id="submitConfirm" class="btn btn-primary">确定</button>
                                     </div>
-                                    <!--Form的id为myForm-->
-                                    <form id="myForm" method="POST" action="">
-                                        <div class="modal-body">
-                                            是否删除游戏
-                                        </div>
-                                        <input type="hidden" class="gameId" name="gameId">
-                                        <input type="hidden" class="gameType" name="gameType">
-                                        <input type="hidden" class="endTime" name="endTime">
-                                        <input type="hidden" class="showTime" name="showTime">
-                                        <div class="modal-footer">
-                                            <button type="button" class="btn btn-default" data-dismiss="modal">关闭
-                                            </button>
-                                            <button type="submit" id="submitConfirm" class="btn btn-primary">确定</button>
-                                        </div>
-                                    </form>
-                                </div>
-
+                                </form>
                             </div>
 
                         </div>
 
                     </div>
 
-
                 </div>
-                <#--分页-->
-                <#if nickname??>
-                <#else >
-                    <div class="row clearfix">
-                        <div class="col-md-12 ">
-                            <nav aria-label="Page navigation example">
-                                <ul class="pagination pull-right">
-                                    <#if currentPage lte 1>
-                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
-                                    <#else>
-                                        <li class="page-item ">
-                                            <a class="page-link" href="${req.contextPath}/backstage_game/list?page=${currentPage - 1}&size=${size}">上一页</a>
-                                        </li>
-                                    </#if>
 
-                                    <#list 1..gameInfos.getTotalPages() as index>
-                                        <#if currentPage == index>
-                                            <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
-                                            </li>
-                                        <#else>
-                                            <li class="page-item ">
-                                                <a class="page-link"
-                                                   href="${req.contextPath}/backstage_game/list?page=${index}&size=${size}">${index}</a>
-                                            </li>
-                                        </#if>
-                                    </#list>
 
-                                    <#if currentPage gte gameInfos.getTotalPages()>
-                                        <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+            </div>
+            <#--分页-->
+            <#if nickname??>
+            <#else >
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <nav aria-label="Page navigation example">
+                            <ul class="pagination pull-right">
+                                <#if currentPage lte 1>
+                                    <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
+                                <#else>
+                                    <li class="page-item ">
+                                        <a class="page-link" href="${req.contextPath}/backstage_game/list?page=${currentPage - 1}&size=${size}">上一页</a>
+                                    </li>
+                                </#if>
+
+                                <#list 1..gameInfos.getTotalPages() as index>
+                                    <#if currentPage == index>
+                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
+                                        </li>
                                     <#else>
                                         <li class="page-item ">
                                             <a class="page-link"
-                                               href="${req.contextPath}/backstage_game/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                               href="${req.contextPath}/backstage_game/list?page=${index}&size=${size}">${index}</a>
                                         </li>
                                     </#if>
-                                </ul>
-                            </nav>
+                                </#list>
+
+                                <#if currentPage gte gameInfos.getTotalPages()>
+                                    <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+                                <#else>
+                                    <li class="page-item ">
+                                        <a class="page-link"
+                                           href="${req.contextPath}/backstage_game/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                    </li>
+                                </#if>
+                            </ul>
+                        </nav>
 
-                        </div>
                     </div>
-                </#if>
-
-                <div class="row clearfix">
-                    <div class="col-md-12 ">
-                        <div class="card">
-                            <div class="card-body">
-                                <ul class="nav nav-tabs b-none">
-                                    <li class="nav-item"><a class="nav-link active" data-toggle="tab"
-                                                            href="#game-tab"><i class="fa fa-list-ul"></i>推荐的游戏</a>
-                                    </li>
-                                    <li class="nav-item"><a class="nav-link" data-toggle="tab"
-                                                            href="#video-tab"><i class="fa fa-list-ul"></i>推荐的视频</a>
-                                    </li>
-                                </ul>
-                            </div>
-                            <div class="card-body">
-                                <div class="tab-content">
-                                    <div class="tab-pane fade active show" id="game-tab">
-                                        <div class="row clearfix">
-                                            <div class="col-12">
-                                                <div class="card-group mb-4">
-                                                    <#if gameRecommend??>
-                                                        <#list gameRecommend as item>
-                                                            <div class="col-lg-3 col-md-6">
-                                                                <div class="card">
-                                                                    <div class="card-img-top" style="background-color: black;">
-                                                                        <img style="height: 200px;clear: both;display: block;margin: auto;"
-                                                                             src="${(item.gameIcon)!''}"
-                                                                             alt="Card image cap">
-                                                                    </div>
-                                                                    <div class="card-body">
-                                                                        <h5 class="card-title">${item.gameName}</h5>
-                                                                        <p class="card-text">${item.gameDescription}</p>
-                                                                        <p class="card-text"><small
-                                                                                    class="text-muted">${(item.createTime?string('yyyy-MM-dd'))!''}</small>
-                                                                        </p>
-                                                                        <button data-target="#modal-container-481574"
-                                                                                role="button"
-                                                                                class="btn btn-primary"
-                                                                                data-toggle="modal"
-                                                                                data-type="delete_recommend_game"
-                                                                                data-name="${item.gameName}"
-                                                                                data-game-id="${item.gameId}">删除
-                                                                        </button>
-                                                                    </div>
+                </div>
+            </#if>
+
+            <div class="row clearfix">
+                <div class="col-md-12 ">
+                    <div class="card">
+                        <div class="card-body">
+                            <ul class="nav nav-tabs b-none">
+                                <li class="nav-item"><a class="nav-link active" data-toggle="tab"
+                                                        href="#game-tab"><i class="fa fa-list-ul"></i>推荐的游戏</a>
+                                </li>
+                                <li class="nav-item"><a class="nav-link" data-toggle="tab"
+                                                        href="#video-tab"><i class="fa fa-list-ul"></i>推荐的视频</a>
+                                </li>
+                            </ul>
+                        </div>
+                        <div class="card-body">
+                            <div class="tab-content">
+                                <div class="tab-pane fade active show" id="game-tab">
+                                    <div class="row clearfix">
+                                        <div class="col-12">
+                                            <div class="card-group mb-4">
+                                                <#if gameRecommend??>
+                                                    <#list gameRecommend as item>
+                                                        <div class="col-lg-3 col-md-6">
+                                                            <div class="card">
+                                                                <div class="card-img-top" style="background-color: black;">
+                                                                    <img style="height: 200px;clear: both;display: block;margin: auto;"
+                                                                         src="${(item.gameIcon)!''}"
+                                                                         alt="Card image cap">
+                                                                </div>
+                                                                <div class="card-body">
+                                                                    <h5 class="card-title">${item.gameName}</h5>
+                                                                    <p class="card-text">${item.gameDescription}</p>
+                                                                    <p class="card-text"><small
+                                                                                class="text-muted">${(item.createTime?string('yyyy-MM-dd'))!''}</small>
+                                                                    </p>
+                                                                    <button data-target="#modal-container-481574"
+                                                                            role="button"
+                                                                            class="btn btn-primary"
+                                                                            data-toggle="modal"
+                                                                            data-type="delete_recommend_game"
+                                                                            data-name="${item.gameName}"
+                                                                            data-game-id="${item.gameId}">删除
+                                                                    </button>
                                                                 </div>
                                                             </div>
-                                                        </#list>
-                                                    </#if>
+                                                        </div>
+                                                    </#list>
+                                                </#if>
 
-                                                </div>
                                             </div>
-
                                         </div>
 
                                     </div>
-                                    <div class="tab-pane fade " id="video-tab">
-                                        <div class="row clearfix">
-                                            <#if videoRecommend??>
-                                                <#list videoRecommend as item>
-                                                    <div class="col-lg-3 col-md-6">
-                                                        <div class="card">
-                                                            <div class="card-img-top" style="background-color: black;">
-                                                                <img style="height: 200px;clear: both;display: block;margin: auto;"
-                                                                     src="${(item.gameIcon)!''}"
-                                                                     alt="Card image cap">
-                                                            </div>
 
-                                                            <div class="card-body">
-                                                                <h5 class="card-title">${item.gameName}</h5>
-                                                                <p class="card-text">${item.gameDescription}</p>
-                                                                <p class="card-text"><small
-                                                                            class="text-muted">${(item.createTime?string('yyyy-MM-dd'))!''}</small>
-                                                                </p>
-                                                                <button data-target="#modal-container-481574"
-                                                                        role="button"
-                                                                        class="btn btn-primary"
-                                                                        data-toggle="modal"
-                                                                        data-type="delete_recommend_game"
-                                                                        data-name="${item.gameName}"
-                                                                        data-game-id="${item.gameId}">删除
-                                                                </button>
-                                                            </div>
+                                </div>
+                                <div class="tab-pane fade " id="video-tab">
+                                    <div class="row clearfix">
+                                        <#if videoRecommend??>
+                                            <#list videoRecommend as item>
+                                                <div class="col-lg-3 col-md-6">
+                                                    <div class="card">
+                                                        <div class="card-img-top" style="background-color: black;">
+                                                            <img style="height: 200px;clear: both;display: block;margin: auto;"
+                                                                 src="${(item.gameIcon)!''}"
+                                                                 alt="Card image cap">
+                                                        </div>
+
+                                                        <div class="card-body">
+                                                            <h5 class="card-title">${item.gameName}</h5>
+                                                            <p class="card-text">${item.gameDescription}</p>
+                                                            <p class="card-text"><small
+                                                                        class="text-muted">${(item.createTime?string('yyyy-MM-dd'))!''}</small>
+                                                            </p>
+                                                            <button data-target="#modal-container-481574"
+                                                                    role="button"
+                                                                    class="btn btn-primary"
+                                                                    data-toggle="modal"
+                                                                    data-type="delete_recommend_game"
+                                                                    data-name="${item.gameName}"
+                                                                    data-game-id="${item.gameId}">删除
+                                                            </button>
                                                         </div>
                                                     </div>
-                                                </#list>
-                                            </#if>
-                                        </div>
+                                                </div>
+                                            </#list>
+                                        </#if>
+                                    </div>
 
 
-                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
-
             </div>
 
         </div>
 
     </div>
+
 </div>
 <!-- jQuery and bootstrtap js -->
 <script src="../main-bundles/lib.vendor.bundle.js"></script>

src/main/resources/templates/index.ftl

@@ -2,6 +2,7 @@
 <html lang="en">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <#include "common/header.ftl">
+<link rel="stylesheet" href="../css/main-css/theme3.css" id="stylesheet"/>
 <#setting number_format="#">
 <body class="font-opensans  sidebar_dark">
 <!-- Page Loader -->
@@ -18,49 +19,37 @@
     <div class="page">
         <#assign title = "关卡列表">
         <#-- 顶部栏-->
-        <#include "common/pageTop.ftl">
-
-        <#--    主要内容content-->
-        <div class="section-body">
-            <div class="container-fluid">
-                <ul class="nav nav-tabs page-header-tab" id="tabContainer">
-<#--                    <li class="nav-item">-->
-<#--                        <a class="nav-link active" id="pills-calendar-tab" data-toggle="pill" href="#pills-calendar" role="tab" aria-controls="pills-calendar" aria-selected="false">单人关卡</a>-->
-<#--                    </li>-->
-<#--                    <li class="nav-item">-->
-<#--                        <a class="nav-link" id="pills-timeline-tab" data-toggle="pill" href="#pills-timeline" role="tab" aria-controls="pills-timeline" aria-selected="true">对战关卡</a>-->
-<#--                    </li>-->
-                </ul>
-
-                <div class="row clearfix">
-                    <div class="col-md-12 ">
-                        <div class="tab-content" id="pills-tabContent">
-                            <div class="tab-pane fade show active" id="pills-calendar" role="tabpanel" aria-labelledby="pills-calendar-tab">
-                                <div class="card">
-                                    <div class="card-body">
-
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="tab-pane fade" id="pills-timeline" role="tabpanel" aria-labelledby="pills-timeline-tab">
-                                <div class="card">
-                                    <div class="card-body">
-
-                                    </div>
-                                </div>
-                            </div>
+        <#--  <#include "common/pageTop.ftl">-->
+        <div id="page_top" class="section-body">
+            <div class="container-fluid"  >
+                <div class="page-header">
+                    <div class="left">
+                        <#if profiles == 'prd'>
+                            <h1 class="page-title">哔蹦后台管理系统</h1>
+                        <#else >
+                            <h1 class="page-title">哔蹦测试后台管理系统</h1>
+                        </#if>
 
+                    </div>
+                    <div class="right">
+                        <div class="notification d-flex">
+                            <button type="button" class="btn btn-facebook"><i class="fa fa-info-circle mr-2"></i>Need Help</button>
+                            <button type="button" class="btn btn-facebook"><i class="fa fa-file-text mr-2"></i>Data export</button>
+                            <button type="button" class="btn btn-facebook"><i class="fa fa-power-off mr-2"></i>Sign Out</button>
                         </div>
-
-
                     </div>
                 </div>
 
-            </div>
+                <div id="tabContainer"></div>
 
+            </div>
+        </div>
+        <#--    主要内容content-->
+        <div class="section-body">
+            <div class="container-fluid" id="frameContainer">
+                <#--      iframe动态构建添加模板代码         -->
+            </div>
         </div>
-
     </div>
 </div>
 
@@ -68,55 +57,129 @@
 <script src="../main-bundles/lib.vendor.bundle.js"></script>
 <!-- Start core js and page js -->
 <script src="../js/core.js"></script>
-
 <script src="../js/iframe/iframe.js"></script>
-
 <script>
-
-    var iframe = $("#tabContainer").iframes({
-        data: [ {
+    let  iframe = $('.page').iframes({
+        data: [{
             id: 'home',
             text: '用户',
-            url: "/mgr/user_edit/47",
+            url: "${req.contextPath}/backstage_user/list",
             closeable: true
         }, {
-            id: 'admineap2',
-            text: '日志列表',
-            url: "/menu/menu_edit/158"
-            ,closeable: true
-        }
-            /* , {
-                id: 'admineap',
-                text: '部门',
-                url: "/dept/dept_update/27"
-            }, {
-                id: 'menu',
-                text: '菜单',
-                url: "/menu/menu_edit/107"
-            },{
-                id: 'edit',
-                text: '百度一下',
-                url: "/blackboard/show",
-                //closeable: true
-            } */],
+            id: 'device',
+            text: '设备列表',
+            url: "${req.contextPath}/backstage_device/list"
+            , closeable: true
+        }],
         //showIndex: 1,
-        loadAll: false
+        loadAll: false,
+        tabContainer:"tabContainer",
+        frameContainer:"frameContainer"
     })
+    // iframe.showIframe('home');//根据数据属性id设置
+    $('#IdUserList').on('click', function() {
+        iframe.addIframe({
+            id: 'User-List',
+            text: '用户',
+            url: "${req.contextPath}/backstage_user/list",
+            closeable: true
+        });
+    });
+    $('#IdQRCodeList').on('click', function() {
+        iframe.addIframe({
+            id: 'QR-Device',
+            text: '二维码列表',
+            url: "${req.contextPath}/backstage_device/list"
+            , closeable: true
+        });
+    });
+    $('#IdQRCodeGenerate').on('click', function() {
+        iframe.addIframe({
+            id: 'QR-Generate',
+            text: '生成二维码',
+            url: "${req.contextPath}/backstage_device/generateManager"
+            , closeable: true
+        });
+    });
+    $('#IdBLEList').on('click', function() {
+        iframe.addIframe({
+            id: 'BLE-Device',
+            text: '蓝牙列表',
+            url: "${req.contextPath}/backstage_ble/list",
+            closeable: true
+        });
+    });
+    $('#IdBLEGenerate').on('click', function() {
+        iframe.addIframe({
+            id: 'BLE-Generate',
+            text: '生成蓝牙信息',
+            url: "${req.contextPath}/backstage_ble/generateManager"
+            , closeable: true
+        });
+    });
+    $('#IdGameList').on('click', function() {
+        iframe.addIframe({
+            id: 'Game-List',
+            text: '游戏列表',
+            url: "${req.contextPath}/backstage_game/list"
+            , closeable: true
+        });
+    });
+    $('#IdGameNew').on('click', function() {
+        iframe.addIframe({
+            id: 'Game-New',
+            text: '新的游戏',
+            url: "${req.contextPath}/backstage_game/add"
+            , closeable: true
+        });
+    });
+
+    $('#IdPictureList').on('click', function() {
+        iframe.addIframe({
+            id: 'Picture-List',
+            text: '图片列表',
+            url: "${req.contextPath}/backstage_picture/list",
+            closeable: true
+        });
+    });
+
+    $('#IdCategoryList').on('click', function() {
+        iframe.addIframe({
+            id: 'Category-List',
+            text: '标签列表',
+            url: "${req.contextPath}/backstage_tag/list",
+            closeable: true
+        });
+    });
 
-    iframe.addIframe({
-        id: 'admineap',
-        text: '部门',
-        url: "/dept/dept_update/27"
-        ,closeable: true
+    $('#IdClientLog').on('click', function() {
+        iframe.addIframe({
+            id: 'Client-List',
+            text: '日志',
+            url: "${req.contextPath}/backstage_log/client",
+            closeable: true
+        });
     });
 
-    iframe.addIframe({
-        id: 'menu',
-        text: '菜单',
-        url: "/menu/menu_edit/107"
-        ,closeable: true
+
+    $('#IdLevelList').on('click', function() {
+        iframe.addIframe({
+            id: 'Level-List',
+            text: '关卡列表',
+            url: "${req.contextPath}/backstage_level/getLevelJumpList"
+            , closeable: true
+        });
+    });
+    $('#IdLevelNew').on('click', function() {
+        iframe.addIframe({
+            id: 'Level-New',
+            text: '新的关卡',
+            url: "${req.contextPath}/backstage_level/add"
+            , closeable: true
+        });
     });
-    //iframe.showIframe('admineap');//根据数据属性id设置
+
+
 </script>
 </body>
 </html>

src/main/resources/templates/log/client-copy.ftl

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<#include "../common/header.ftl">
+<#setting number_format="#">
+
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body class="font-opensans  sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "前端日志处理">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+        <div class="section-body">
+            <div class="container-fluid">
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+
+                        <div class="row clearfix">
+                            <div class="col-md-12 ">
+                                <div class="card">
+                                    <div class="col-lg-12 col-md-12">
+                                        <div class="card">
+                                            <div class="card-header">
+                                                <h3 class="card-title">Large scale area chart</h3>
+                                            </div>
+                                            <div class="card-body">
+                                                <div id="echart-large_scale_area" style="height: 400px;"></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+
+            </div>
+
+        </div>
+    </div>
+</div>
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+
+<!-- start plugin js file  -->
+<script src="../main-bundles/echarts.bundle.js"></script>
+
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+
+<script src="../js/chart/echart.js"></script>
+</body>
+</html>

src/main/resources/templates/log/client.ftl

@@ -14,43 +14,35 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "前端日志处理">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
-        <div class="section-body">
-            <div class="container-fluid">
-                <div class="row clearfix">
-                    <div class="col-md-12 ">
-
-                        <div class="row clearfix">
-                            <div class="col-md-12 ">
-                                <div class="card">
-                                    <div class="col-lg-12 col-md-12">
-                                        <div class="card">
-                                            <div class="card-header">
-                                                <h3 class="card-title">Large scale area chart</h3>
-                                            </div>
-                                            <div class="card-body">
-                                                <div id="echart-large_scale_area" style="height: 400px;"></div>
-                                            </div>
+    <div style="height: 10px;"></div>
+    <div class="section-body">
+        <div class="container-fluid">
+            <div class="row clearfix">
+                <div class="col-md-12 ">
+
+                    <div class="row clearfix">
+                        <div class="col-md-12 ">
+                            <div class="card">
+                                <div class="col-lg-12 col-md-12">
+                                    <div class="card">
+                                        <div class="card-header">
+                                            <h3 class="card-title">Large scale area chart</h3>
+                                        </div>
+                                        <div class="card-body">
+                                            <div id="echart-large_scale_area" style="height: 400px;"></div>
                                         </div>
                                     </div>
                                 </div>
-
                             </div>
-                        </div>
 
+                        </div>
                     </div>
-                </div>
 
+                </div>
             </div>
 
         </div>
+
     </div>
 </div>
 <!-- jQuery and bootstrtap js -->

src/main/resources/templates/picture/list-copy.ftl

@@ -0,0 +1,228 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <#include "../common/header.ftl">
+    <#setting number_format="#">
+    <link href="../main-plugins/bootstrap-fileinput/css/fileinput.min.css" media="all" rel="stylesheet" type="text/css">
+
+    <style>
+        .kv-avatar .krajee-default.file-preview-frame, .kv-avatar .krajee-default.file-preview-frame:hover {
+            margin: 0;
+            padding: 0;
+            border: none;
+            box-shadow: none;
+            text-align: center;
+        }
+
+        .kv-avatar {
+            display: inline-block;
+        }
+
+        .kv-avatar .file-input {
+            display: table-cell;
+            width: 213px;
+        }
+
+        .kv-reqd {
+            color: red;
+            font-family: monospace;
+            font-weight: normal;
+        }
+    </style>
+</head>
+
+<body class="font-opensans  sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "图片列表">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+
+        <#--    主要内容content-->
+        <div class="section-body">
+            <div class="container-fluid">
+                <div class="row clearfix">
+                    <div class="col-md-12 column">
+                        <div class="form-group">
+                            <form role="form" method="post" action="${req.contextPath}/backstage_picture/upload"
+                                  enctype="multipart/form-data">
+                                <div class="kv-avatar-hint">
+                                    <label>选择封面(不小于1000KB)</label>
+                                </div>
+                                <div class="kv-avatar">
+                                    <div class="file-loading">
+                                        <input id="pictures" name="pictures" type="file">
+                                    </div>
+                                </div>
+<#--                                <div class="kv-avatar-hint">-->
+<#--                                    <small>Select file < 1500 KB</small>-->
+<#--                                </div>-->
+                                <#--                        <button type="submit" class="btn btn-default">提交</button>-->
+                            </form>
+                        </div>
+                        <table class="table table-bordered table-hover">
+                            <thead>
+                            <tr>
+                                <th>
+                                    图片id
+                                </th>
+                                <th>
+                                    图片
+                                </th>
+                                <th>
+                                    图片类型
+                                </th>
+                                <th>
+                                    操作
+                                </th>
+                            </tr>
+                            </thead>
+                            <tbody>
+
+                            <#list Pictures.content as item>
+                                <tr>
+                                    <td>
+                                        ${item.pictureId}
+                                    </td>
+                                    <td>
+                                        <img class="img-rounded " alt="" width="50" height="50"
+                                             src="${(item.pictureUrl)!''}"/>
+                                    </td>
+                                    <td>
+                                        ${item.pictureType}
+                                    </td>
+                                    <td>
+                                        <a href="${req.contextPath}/backstage_picture/deletePicture?pictureId=${item.pictureId}&currentPage=${currentPage}&size=${size}"
+                                           type="button"
+                                           class="btn btn-default btn-danger">删除</a>
+                                    </td>
+                                </tr>
+                            </#list>
+
+
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <#--分页-->
+                <#if username??>
+                <#else >
+                    <div class="row clearfix">
+                        <div class="col-md-12 ">
+                            <nav aria-label="Page navigation example">
+                                <ul class="pagination pull-right">
+                                    <#if currentPage lte 1>
+                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
+                                    <#else>
+                                        <li class="page-item ">
+                                            <a class="page-link" href="${req.contextPath}/backstage_picture/list?page=${currentPage - 1}&size=${size}">上一页</a>
+                                        </li>
+                                    </#if>
+
+                                    <#list 1..Pictures.getTotalPages() as index>
+                                        <#if currentPage == index>
+                                            <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
+                                            </li>
+                                        <#else>
+                                            <li class="page-item ">
+                                                <a class="page-link"
+                                                   href="${req.contextPath}/backstage_picture/list?page=${index}&size=${size}">${index}</a>
+                                            </li>
+                                        </#if>
+                                    </#list>
+
+                                    <#if currentPage gte Pictures.getTotalPages()>
+                                        <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+                                    <#else>
+                                        <li class="page-item ">
+                                            <a class="page-link"
+                                               href="${req.contextPath}/backstage_picture/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                        </li>
+                                    </#if>
+                                </ul>
+                            </nav>
+
+                        </div>
+                    </div>
+                </#if>
+                <#--分页-->
+<#--                <div class="col-md-12 column">-->
+<#--                    <ul class="pagination pull-right">-->
+<#--                        <#if currentPage lte 1>-->
+<#--                            <li class="disabled"><a href="#">上一页</a></li>-->
+<#--                        <#else>-->
+<#--                            <li>-->
+<#--                                <a href="${req.contextPath}/backstage_picture/list?page=${currentPage - 1}&size=${size}">上一页</a>-->
+<#--                            </li>-->
+<#--                        </#if>-->
+
+<#--                        <#list 1..Pictures.getTotalPages() as index>-->
+<#--                            <#if currentPage == index>-->
+<#--                                <li class="disabled"><a href="#">${index}</a></li>-->
+<#--                            <#else>-->
+<#--                                <li>-->
+<#--                                    <a href="${req.contextPath}/backstage_picture/list?page=${index}&size=${size}">${index}</a>-->
+<#--                                </li>-->
+<#--                            </#if>-->
+<#--                        </#list>-->
+
+<#--                        <#if currentPage gte Pictures.getTotalPages()>-->
+<#--                            <li class="disabled"><a href="#">下一页</a></li>-->
+<#--                        <#else>-->
+<#--                            <li>-->
+<#--                                <a href="${req.contextPath}/backstage_picture/list?page=${currentPage + 1}&size=${size}">下一页</a>-->
+<#--                            </li>-->
+<#--                        </#if>-->
+<#--                    </ul>-->
+<#--                </div>-->
+            </div>
+        </div>
+
+    </div>
+</div>
+
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+<#--<!-- 主要的 fileinput 插件库 5.1.2-->
+<script src="../main-plugins/bootstrap-fileinput/js/fileinput.min.js"></script>
+<script src="../main-plugins/bootstrap-fileinput/js/locales/zh.js"></script>
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+
+<script>
+    // var btnCust = '<button type="button" class="btn btn-secondary" title="Add picture tags" ' +
+    //     'onclick="alert(\'Call your custom code here.\')">' +
+    //     '<i class="glyphicon glyphicon-tag"></i>' +
+    //     '</button>';
+    <#-- <img src="${(picture)!""}" style="max-width: 300px;max-height: 300px;" alt="封面"> -->
+    var submitButton = '<button type="submit" class="btn btn-default">提交</button>'
+    $("#pictures").fileinput({
+        overwriteInitial: true,
+        maxFileSize: 1000,
+        showClose: false,
+        showCaption: false,
+        browseLabel: '',
+        removeLabel: '',
+        browseIcon: '<i class="glyphicon glyphicon-folder-open"></i>',
+        removeIcon: '<i class="glyphicon glyphicon-remove"></i>',
+        removeTitle: 'Cancel or reset changes',
+        elErrorContainer: '#kv-avatar-errors-1',
+        msgErrorClass: 'alert alert-block alert-danger',
+        defaultPreviewContent: '',
+        layoutTemplates: {main2: '{preview} ' + submitButton + ' {remove} {browse}'},
+        allowedFileExtensions: ["jpg", "png", "gif"]
+    });
+</script>
+</body>
+</html>

src/main/resources/templates/picture/list.ftl

@@ -40,156 +40,146 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "图片列表">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
-
-        <#--    主要内容content-->
-        <div class="section-body">
-            <div class="container-fluid">
-                <div class="row clearfix">
-                    <div class="col-md-12 column">
-                        <div class="form-group">
-                            <form role="form" method="post" action="${req.contextPath}/backstage_picture/upload"
-                                  enctype="multipart/form-data">
-                                <div class="kv-avatar-hint">
-                                    <label>选择封面(不小于1000KB)</label>
-                                </div>
-                                <div class="kv-avatar">
-                                    <div class="file-loading">
-                                        <input id="pictures" name="pictures" type="file">
-                                    </div>
+    <div style="height: 10px;"></div>
+    <div class="section-body">
+        <div class="container-fluid">
+            <div class="row clearfix">
+                <div class="col-md-12 column">
+                    <div class="form-group">
+                        <form role="form" method="post" action="${req.contextPath}/backstage_picture/upload"
+                              enctype="multipart/form-data">
+                            <div class="kv-avatar-hint">
+                                <label>选择封面(不小于1000KB)</label>
+                            </div>
+                            <div class="kv-avatar">
+                                <div class="file-loading">
+                                    <input id="pictures" name="pictures" type="file">
                                 </div>
-<#--                                <div class="kv-avatar-hint">-->
-<#--                                    <small>Select file < 1500 KB</small>-->
-<#--                                </div>-->
-                                <#--                        <button type="submit" class="btn btn-default">提交</button>-->
-                            </form>
-                        </div>
-                        <table class="table table-bordered table-hover">
-                            <thead>
+                            </div>
+                            <#--                                <div class="kv-avatar-hint">-->
+                            <#--                                    <small>Select file < 1500 KB</small>-->
+                            <#--                                </div>-->
+                            <#--                        <button type="submit" class="btn btn-default">提交</button>-->
+                        </form>
+                    </div>
+                    <table class="table table-bordered table-hover">
+                        <thead>
+                        <tr>
+                            <th>
+                                图片id
+                            </th>
+                            <th>
+                                图片
+                            </th>
+                            <th>
+                                图片类型
+                            </th>
+                            <th>
+                                操作
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody>
+
+                        <#list Pictures.content as item>
                             <tr>
-                                <th>
-                                    图片id
-                                </th>
-                                <th>
-                                    图片
-                                </th>
-                                <th>
-                                    图片类型
-                                </th>
-                                <th>
-                                    操作
-                                </th>
+                                <td>
+                                    ${item.pictureId}
+                                </td>
+                                <td>
+                                    <img class="img-rounded " alt="" width="50" height="50"
+                                         src="${(item.pictureUrl)!''}"/>
+                                </td>
+                                <td>
+                                    ${item.pictureType}
+                                </td>
+                                <td>
+                                    <a href="${req.contextPath}/backstage_picture/deletePicture?pictureId=${item.pictureId}&currentPage=${currentPage}&size=${size}"
+                                       type="button"
+                                       class="btn btn-default btn-danger">删除</a>
+                                </td>
                             </tr>
-                            </thead>
-                            <tbody>
-
-                            <#list Pictures.content as item>
-                                <tr>
-                                    <td>
-                                        ${item.pictureId}
-                                    </td>
-                                    <td>
-                                        <img class="img-rounded " alt="" width="50" height="50"
-                                             src="${(item.pictureUrl)!''}"/>
-                                    </td>
-                                    <td>
-                                        ${item.pictureType}
-                                    </td>
-                                    <td>
-                                        <a href="${req.contextPath}/backstage_picture/deletePicture?pictureId=${item.pictureId}&currentPage=${currentPage}&size=${size}"
-                                           type="button"
-                                           class="btn btn-default btn-danger">删除</a>
-                                    </td>
-                                </tr>
-                            </#list>
-
-
-                            </tbody>
-                        </table>
-                    </div>
+                        </#list>
+
+
+                        </tbody>
+                    </table>
                 </div>
-                <#--分页-->
-                <#if username??>
-                <#else >
-                    <div class="row clearfix">
-                        <div class="col-md-12 ">
-                            <nav aria-label="Page navigation example">
-                                <ul class="pagination pull-right">
-                                    <#if currentPage lte 1>
-                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
-                                    <#else>
-                                        <li class="page-item ">
-                                            <a class="page-link" href="${req.contextPath}/backstage_picture/list?page=${currentPage - 1}&size=${size}">上一页</a>
+            </div>
+            <#--分页-->
+            <#if username??>
+            <#else >
+                <div class="row clearfix">
+                    <div class="col-md-12 ">
+                        <nav aria-label="Page navigation example">
+                            <ul class="pagination pull-right">
+                                <#if currentPage lte 1>
+                                    <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
+                                <#else>
+                                    <li class="page-item ">
+                                        <a class="page-link" href="${req.contextPath}/backstage_picture/list?page=${currentPage - 1}&size=${size}">上一页</a>
+                                    </li>
+                                </#if>
+
+                                <#list 1..Pictures.getTotalPages() as index>
+                                    <#if currentPage == index>
+                                        <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
                                         </li>
-                                    </#if>
-
-                                    <#list 1..Pictures.getTotalPages() as index>
-                                        <#if currentPage == index>
-                                            <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
-                                            </li>
-                                        <#else>
-                                            <li class="page-item ">
-                                                <a class="page-link"
-                                                   href="${req.contextPath}/backstage_picture/list?page=${index}&size=${size}">${index}</a>
-                                            </li>
-                                        </#if>
-                                    </#list>
-
-                                    <#if currentPage gte Pictures.getTotalPages()>
-                                        <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
                                     <#else>
                                         <li class="page-item ">
                                             <a class="page-link"
-                                               href="${req.contextPath}/backstage_picture/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                               href="${req.contextPath}/backstage_picture/list?page=${index}&size=${size}">${index}</a>
                                         </li>
                                     </#if>
-                                </ul>
-                            </nav>
+                                </#list>
+
+                                <#if currentPage gte Pictures.getTotalPages()>
+                                    <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+                                <#else>
+                                    <li class="page-item ">
+                                        <a class="page-link"
+                                           href="${req.contextPath}/backstage_picture/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                    </li>
+                                </#if>
+                            </ul>
+                        </nav>
 
-                        </div>
                     </div>
-                </#if>
-                <#--分页-->
-<#--                <div class="col-md-12 column">-->
-<#--                    <ul class="pagination pull-right">-->
-<#--                        <#if currentPage lte 1>-->
-<#--                            <li class="disabled"><a href="#">上一页</a></li>-->
-<#--                        <#else>-->
-<#--                            <li>-->
-<#--                                <a href="${req.contextPath}/backstage_picture/list?page=${currentPage - 1}&size=${size}">上一页</a>-->
-<#--                            </li>-->
-<#--                        </#if>-->
-
-<#--                        <#list 1..Pictures.getTotalPages() as index>-->
-<#--                            <#if currentPage == index>-->
-<#--                                <li class="disabled"><a href="#">${index}</a></li>-->
-<#--                            <#else>-->
-<#--                                <li>-->
-<#--                                    <a href="${req.contextPath}/backstage_picture/list?page=${index}&size=${size}">${index}</a>-->
-<#--                                </li>-->
-<#--                            </#if>-->
-<#--                        </#list>-->
-
-<#--                        <#if currentPage gte Pictures.getTotalPages()>-->
-<#--                            <li class="disabled"><a href="#">下一页</a></li>-->
-<#--                        <#else>-->
-<#--                            <li>-->
-<#--                                <a href="${req.contextPath}/backstage_picture/list?page=${currentPage + 1}&size=${size}">下一页</a>-->
-<#--                            </li>-->
-<#--                        </#if>-->
-<#--                    </ul>-->
-<#--                </div>-->
-            </div>
+                </div>
+            </#if>
+            <#--分页-->
+            <#--                <div class="col-md-12 column">-->
+            <#--                    <ul class="pagination pull-right">-->
+            <#--                        <#if currentPage lte 1>-->
+            <#--                            <li class="disabled"><a href="#">上一页</a></li>-->
+            <#--                        <#else>-->
+            <#--                            <li>-->
+            <#--                                <a href="${req.contextPath}/backstage_picture/list?page=${currentPage - 1}&size=${size}">上一页</a>-->
+            <#--                            </li>-->
+            <#--                        </#if>-->
+
+            <#--                        <#list 1..Pictures.getTotalPages() as index>-->
+            <#--                            <#if currentPage == index>-->
+            <#--                                <li class="disabled"><a href="#">${index}</a></li>-->
+            <#--                            <#else>-->
+            <#--                                <li>-->
+            <#--                                    <a href="${req.contextPath}/backstage_picture/list?page=${index}&size=${size}">${index}</a>-->
+            <#--                                </li>-->
+            <#--                            </#if>-->
+            <#--                        </#list>-->
+
+            <#--                        <#if currentPage gte Pictures.getTotalPages()>-->
+            <#--                            <li class="disabled"><a href="#">下一页</a></li>-->
+            <#--                        <#else>-->
+            <#--                            <li>-->
+            <#--                                <a href="${req.contextPath}/backstage_picture/list?page=${currentPage + 1}&size=${size}">下一页</a>-->
+            <#--                            </li>-->
+            <#--                        </#if>-->
+            <#--                    </ul>-->
+            <#--                </div>-->
         </div>
-
     </div>
+
 </div>
 
 <!-- jQuery and bootstrtap js -->

src/main/resources/templates/tag/list-copy.ftl

@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <#include "../common/header.ftl">
+    <#setting number_format="#">
+    <!-- Plugins css -->
+    <link rel="stylesheet" href="../main-plugins/datatable/dataTables.bootstrap4.min.css">
+    <link rel="stylesheet" href="../main-plugins/datatable/fixedeader/dataTables.fixedcolumns.bootstrap4.min.css">
+    <link rel="stylesheet" href="../main-plugins/datatable/fixedeader/dataTables.fixedheader.bootstrap4.min.css">
+
+    <link rel="stylesheet" href="../main-plugins/sweetalert/sweetalert.css">
+    <style>
+        td.details-control {
+            background: url('../images/details_open.png') no-repeat center center;
+            cursor: pointer;
+        }
+        tr.shown td.details-control {
+            background: url('../images/details_close.png') no-repeat center center;
+        }
+    </style>
+</head>
+
+<body class="font-opensans  sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "标签列表">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+
+        <#--    主要内容content-->
+        <div class="section-body">
+            <div class="container-fluid">
+                <div class="row clearfix">
+                    <div class="col-md-12 column">
+                        <div class="form-group">
+                            <div class="card">
+                                <div class="card-header">
+                                    <h3 class="card-title">Add Row</h3>
+                                </div>
+                                <div class="card-body">
+                                    <button id="addToTable" class="btn btn-primary mb-15" type="button">
+                                        <i class="icon wb-plus" aria-hidden="true"></i> 添加标签数据
+                                    </button>
+                                    <div class="table-responsive">
+                                        <table class="table table-hover table-vcenter table-striped" cellspacing="0" id="addrowExample">
+                                            <thead>
+                                            <tr>
+                                                <th>标签名字</th>
+                                                <th>状态</th>
+                                                <th>类型</th>
+                                                <th>操作</th>
+                                            </tr>
+                                            </thead>
+                                            <tfoot>
+                                            <tr>
+                                                <th>标签名字</th>
+                                                <th>状态</th>
+                                                <th>类型</th>
+                                                <th>操作</th>
+                                            </tr>
+                                            </tfoot>
+                                            <tbody>
+<#--                                            <#list 0..100 as i >-->
+<#--                                                <tr class="gradeA">-->
+<#--                                                    <td>Tiger Nixon</td>-->
+<#--                                                    <td>System Architect</td>-->
+<#--                                                    <td>Edinburgh</td>-->
+<#--                                                    <td class="actions">-->
+<#--                                                        <button class="btn btn-sm btn-icon on-editing m-r-5 button-save"-->
+<#--                                                                data-toggle="tooltip" data-original-title="Save" hidden><i class="icon-drawer" aria-hidden="true"></i></button>-->
+<#--                                                        <button class="btn btn-sm btn-icon on-editing button-discard"-->
+<#--                                                                data-toggle="tooltip" data-original-title="Discard" hidden><i class="icon-close" aria-hidden="true"></i></button>-->
+<#--                                                        <button class="btn btn-sm btn-icon on-default m-r-5 button-edit"-->
+<#--                                                                data-toggle="tooltip" data-original-title="Edit"><i class="icon-pencil" aria-hidden="true"></i></button>-->
+<#--                                                        <button class="btn btn-sm btn-icon on-default button-remove"-->
+<#--                                                                data-toggle="tooltip" data-original-title="Remove"><i class="icon-trash" aria-hidden="true"></i></button>-->
+<#--                                                    </td>-->
+<#--                                                </tr>-->
+<#--                                            </#list>-->
+
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+
+                                <#--根路径-->
+                                <input id="PageContext" type="hidden" value="${req.contextPath}" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+
+    </div>
+</div>
+
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+
+<!-- start plugin js file  -->
+<script src="../main-plugins/sweetalert/sweetalert.min.js"></script>
+
+<script src="../main-bundles/dataTables.bundle.js"></script>
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+<script src="../js/table/datatable.js"></script>
+
+</body>
+</html>

src/main/resources/templates/tag/list.ftl

@@ -29,82 +29,73 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "标签列表">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
-
-        <#--    主要内容content-->
-        <div class="section-body">
-            <div class="container-fluid">
-                <div class="row clearfix">
-                    <div class="col-md-12 column">
-                        <div class="form-group">
-                            <div class="card">
-                                <div class="card-header">
-                                    <h3 class="card-title">Add Row</h3>
-                                </div>
-                                <div class="card-body">
-                                    <button id="addToTable" class="btn btn-primary mb-15" type="button">
-                                        <i class="icon wb-plus" aria-hidden="true"></i> 添加标签数据
-                                    </button>
-                                    <div class="table-responsive">
-                                        <table class="table table-hover table-vcenter table-striped" cellspacing="0" id="addrowExample">
-                                            <thead>
-                                            <tr>
-                                                <th>标签名字</th>
-                                                <th>状态</th>
-                                                <th>类型</th>
-                                                <th>操作</th>
-                                            </tr>
-                                            </thead>
-                                            <tfoot>
-                                            <tr>
-                                                <th>标签名字</th>
-                                                <th>状态</th>
-                                                <th>类型</th>
-                                                <th>操作</th>
-                                            </tr>
-                                            </tfoot>
-                                            <tbody>
-<#--                                            <#list 0..100 as i >-->
-<#--                                                <tr class="gradeA">-->
-<#--                                                    <td>Tiger Nixon</td>-->
-<#--                                                    <td>System Architect</td>-->
-<#--                                                    <td>Edinburgh</td>-->
-<#--                                                    <td class="actions">-->
-<#--                                                        <button class="btn btn-sm btn-icon on-editing m-r-5 button-save"-->
-<#--                                                                data-toggle="tooltip" data-original-title="Save" hidden><i class="icon-drawer" aria-hidden="true"></i></button>-->
-<#--                                                        <button class="btn btn-sm btn-icon on-editing button-discard"-->
-<#--                                                                data-toggle="tooltip" data-original-title="Discard" hidden><i class="icon-close" aria-hidden="true"></i></button>-->
-<#--                                                        <button class="btn btn-sm btn-icon on-default m-r-5 button-edit"-->
-<#--                                                                data-toggle="tooltip" data-original-title="Edit"><i class="icon-pencil" aria-hidden="true"></i></button>-->
-<#--                                                        <button class="btn btn-sm btn-icon on-default button-remove"-->
-<#--                                                                data-toggle="tooltip" data-original-title="Remove"><i class="icon-trash" aria-hidden="true"></i></button>-->
-<#--                                                    </td>-->
-<#--                                                </tr>-->
-<#--                                            </#list>-->
+    <div style="height: 10px;"></div>
+    <#--    主要内容content-->
+    <div class="section-body">
+        <div class="container-fluid">
+            <div class="row clearfix">
+                <div class="col-md-12 column">
+                    <div class="form-group">
+                        <div class="card">
+                            <div class="card-header">
+                                <h3 class="card-title">Add Row</h3>
+                            </div>
+                            <div class="card-body">
+                                <button id="addToTable" class="btn btn-primary mb-15" type="button">
+                                    <i class="icon wb-plus" aria-hidden="true"></i> 添加标签数据
+                                </button>
+                                <div class="table-responsive">
+                                    <table class="table table-hover table-vcenter table-striped" cellspacing="0" id="addrowExample">
+                                        <thead>
+                                        <tr>
+                                            <th>标签名字</th>
+                                            <th>状态</th>
+                                            <th>类型</th>
+                                            <th>操作</th>
+                                        </tr>
+                                        </thead>
+                                        <tfoot>
+                                        <tr>
+                                            <th>标签名字</th>
+                                            <th>状态</th>
+                                            <th>类型</th>
+                                            <th>操作</th>
+                                        </tr>
+                                        </tfoot>
+                                        <tbody>
+                                        <#--                                            <#list 0..100 as i >-->
+                                        <#--                                                <tr class="gradeA">-->
+                                        <#--                                                    <td>Tiger Nixon</td>-->
+                                        <#--                                                    <td>System Architect</td>-->
+                                        <#--                                                    <td>Edinburgh</td>-->
+                                        <#--                                                    <td class="actions">-->
+                                        <#--                                                        <button class="btn btn-sm btn-icon on-editing m-r-5 button-save"-->
+                                        <#--                                                                data-toggle="tooltip" data-original-title="Save" hidden><i class="icon-drawer" aria-hidden="true"></i></button>-->
+                                        <#--                                                        <button class="btn btn-sm btn-icon on-editing button-discard"-->
+                                        <#--                                                                data-toggle="tooltip" data-original-title="Discard" hidden><i class="icon-close" aria-hidden="true"></i></button>-->
+                                        <#--                                                        <button class="btn btn-sm btn-icon on-default m-r-5 button-edit"-->
+                                        <#--                                                                data-toggle="tooltip" data-original-title="Edit"><i class="icon-pencil" aria-hidden="true"></i></button>-->
+                                        <#--                                                        <button class="btn btn-sm btn-icon on-default button-remove"-->
+                                        <#--                                                                data-toggle="tooltip" data-original-title="Remove"><i class="icon-trash" aria-hidden="true"></i></button>-->
+                                        <#--                                                    </td>-->
+                                        <#--                                                </tr>-->
+                                        <#--                                            </#list>-->
 
-                                            </tbody>
-                                        </table>
-                                    </div>
+                                        </tbody>
+                                    </table>
                                 </div>
-
-                                <#--根路径-->
-                                <input id="PageContext" type="hidden" value="${req.contextPath}" />
                             </div>
+
+                            <#--根路径-->
+                            <input id="PageContext" type="hidden" value="${req.contextPath}" />
                         </div>
                     </div>
                 </div>
-
             </div>
-        </div>
 
+        </div>
     </div>
+
 </div>
 
 <!-- jQuery and bootstrtap js -->

src/main/resources/templates/user/detail-copy.ftl

@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="en">
+<#include "../common/header.ftl">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body class="font-opensans  sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "用户数据">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+
+        <#--    主要内容content-->
+        <div class="section-body">
+            <div class="container-fluid">
+                <div class="row clearfix">
+                    <div class="col-md-12">
+                        <div class="card">
+                            <div class="card-header">
+                                <h3>详情</h3>
+                            </div>
+                            <div class="card-body">
+                                <table class="table table-bordered">
+                                    <thead>
+                                    <tr>
+                                        <th>头像</th>
+                                        <th>姓名</th>
+                                        <th>性别</th>
+                                        <th>生日</th>
+                                        <th>签名</th>
+                                        <th>身高</th>
+                                        <th>体重</th>
+                                        <th>注册时间</th>
+                                        <th>城市代码</th>
+<#--                                        <th>操作</th>-->
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr>
+                                        <td>
+                                            <img class="img-rounded " alt="" width="50" height="50"
+                                                 src="${(userInfo.avatarUrl)!''}"/>
+                                        </td>
+                                        <td>${userInfo.username}</td>
+                                        <td>
+                                            <#if userInfo.gender == "0">
+                                                <a style="color: red">
+                                                    男
+                                                </a>
+                                            <#else >
+                                                <a style="color: gray">
+                                                    女
+                                                </a>
+                                            </#if>
+                                        </td>
+                                        <td>${userInfo.birthday}</td>
+                                        <td>${(userInfo.signature)!''}</td>
+                                        <td>${(userInfo.height)!''}</td>
+                                        <td>${(userInfo.weight)!''}</td>
+                                        <td>${userInfo.registerTime}</td>
+                                        <td>${(userInfo.cityCode)!''}</td>
+<#--                                        <td>-->
+<#--                                            <a href="${req.contextPath}/backstage_manager/backstage_delete_user?userId=${userInfo.userId}" type="button" class="btn btn-primary">删除用户信息</a>-->
+<#--                                        </td>-->
+                                    </tr>
+
+                                    </tbody>
+                                </table>
+
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+</body>
+</html>

src/main/resources/templates/user/detail.ftl

@@ -12,77 +12,59 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "用户数据">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
-
-        <#--    主要内容content-->
-        <div class="section-body">
-            <div class="container-fluid">
-                <div class="row clearfix">
-                    <div class="col-md-12">
-                        <div class="card">
-                            <div class="card-header">
-                                <h3>详情</h3>
-                            </div>
-                            <div class="card-body">
-                                <table class="table table-bordered">
-                                    <thead>
-                                    <tr>
-                                        <th>头像</th>
-                                        <th>姓名</th>
-                                        <th>性别</th>
-                                        <th>生日</th>
-                                        <th>签名</th>
-                                        <th>身高</th>
-                                        <th>体重</th>
-                                        <th>注册时间</th>
-                                        <th>城市代码</th>
-<#--                                        <th>操作</th>-->
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    <tr>
-                                        <td>
-                                            <img class="img-rounded " alt="" width="50" height="50"
-                                                 src="${(userInfo.avatarUrl)!''}"/>
-                                        </td>
-                                        <td>${userInfo.username}</td>
-                                        <td>
-                                            <#if userInfo.gender == "0">
-                                                <a style="color: red">
-                                                    男
-                                                </a>
-                                            <#else >
-                                                <a style="color: gray">
-                                                    女
-                                                </a>
-                                            </#if>
-                                        </td>
-                                        <td>${userInfo.birthday}</td>
-                                        <td>${(userInfo.signature)!''}</td>
-                                        <td>${(userInfo.height)!''}</td>
-                                        <td>${(userInfo.weight)!''}</td>
-                                        <td>${userInfo.registerTime}</td>
-                                        <td>${(userInfo.cityCode)!''}</td>
-<#--                                        <td>-->
-<#--                                            <a href="${req.contextPath}/backstage_manager/backstage_delete_user?userId=${userInfo.userId}" type="button" class="btn btn-primary">删除用户信息</a>-->
-<#--                                        </td>-->
-                                    </tr>
-
-                                    </tbody>
-                                </table>
+    <div class="container-fluid " style="margin-top: 10px;">
+        <div class="card">
+            <div class="card-header">
+                <h3>详情</h3>
+            </div>
+            <div class="card-body">
+                <table class="table table-bordered">
+                    <thead>
+                    <tr>
+                        <th>头像</th>
+                        <th>姓名</th>
+                        <th>性别</th>
+                        <th>生日</th>
+                        <th>签名</th>
+                        <th>身高</th>
+                        <th>体重</th>
+                        <th>注册时间</th>
+                        <th>城市代码</th>
+                        <#--                                        <th>操作</th>-->
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>
+                            <img class="img-rounded " alt="" width="50" height="50"
+                                 src="${(userInfo.avatarUrl)!''}"/>
+                        </td>
+                        <td>${userInfo.username}</td>
+                        <td>
+                            <#if userInfo.gender == "0">
+                                <a style="color: red">
+                                    男
+                                </a>
+                            <#else >
+                                <a style="color: gray">
+                                    女
+                                </a>
+                            </#if>
+                        </td>
+                        <td>${userInfo.birthday}</td>
+                        <td>${(userInfo.signature)!''}</td>
+                        <td>${(userInfo.height)!''}</td>
+                        <td>${(userInfo.weight)!''}</td>
+                        <td>${userInfo.registerTime}</td>
+                        <td>${(userInfo.cityCode)!''}</td>
+                        <#--                                        <td>-->
+                        <#--                                            <a href="${req.contextPath}/backstage_manager/backstage_delete_user?userId=${userInfo.userId}" type="button" class="btn btn-primary">删除用户信息</a>-->
+                        <#--                                        </td>-->
+                    </tr>
 
-                            </div>
-                        </div>
-                    </div>
+                    </tbody>
+                </table>
 
-                </div>
             </div>
         </div>
     </div>

src/main/resources/templates/user/list-copy.ftl

@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<#include "../common/header.ftl">
+<#setting number_format="#">
+<body class="font-opensans  sidebar_dark ">
+<!-- Page Loader -->
+<div class="page-loader-wrapper">
+    <div class="loader">
+    </div>
+</div>
+<!-- Start main html -->
+<div id="main_content">
+    <#--边栏sidebar-->
+    <#include "../common/iconMenu.ftl">
+    <#--主菜单-->
+    <#include "../common/startMainMenu.ftl">
+    <div class="page">
+        <#assign title = "用户列表">
+        <#-- 顶部栏-->
+        <#include "../common/pageTop.ftl">
+
+            <#--    主要内容content-->
+            <div class="section-body">
+                <div class="container-fluid">
+                    <div class="row clearfix">
+                        <div class="col-md-12 ">
+                            <div class="card">
+                                <div class="card-header">
+                                    <h3 class="card-title">用户名字</h3>
+                                </div>
+                                <div class="card-body">
+                                    <form role="form" name="nickForm" method="post"
+                                          action="${req.contextPath}/backstage_user/searchUserInfo">
+                                        <div class="input-group mb-3 ">
+                                            <input type="text" class="form-control" name="username" value="${(username)!''}"/>
+                                            <#if username??>
+                                                <label>当前页数</label>
+                                                <input type="text" name="page" value="${currentPage}">
+                                                <input hidden type="text" name="size" value="${size}">
+                                            </#if>
+                                            <div class="input-group-append">
+                                                <button type="submit" class="btn btn-primary">查询</button>
+                                            </div>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="row clearfix">
+                        <div class="col-md-12 ">
+                            <div class="card">
+                                <div class="card-body">
+                                    <table class="table table-bordered table-hover">
+                                        <thead>
+                                        <tr>
+                                            <th>
+                                                用户id
+                                            </th>
+                                            <th>
+                                                头像
+                                            </th>
+                                            <th>
+                                                用户名
+                                            </th>
+                                            <th>
+                                                性别
+                                            </th>
+
+                                            <th>城市代码</th>
+
+                                            <th>详情</th>
+
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+
+                                        <#list userInfo.content as item>
+                                            <tr>
+
+                                                <td>
+                                                    ${item.userId}
+                                                </td>
+                                                <td>
+                                                    <img class="img-rounded " alt="" width="50" height="50"
+                                                         src="${(item.avatarUrl)!''}"/>
+                                                </td>
+                                                <td>
+                                                    ${item.username}
+                                                </td>
+                                                <td>
+                                                    ${item.gender}
+                                                </td>
+                                                <td>
+                                                    ${(item.cityCode)!''}
+                                                </td>
+                                                <td>
+                                                    <a href="${req.contextPath}/backstage_user/detail?userId=${item.userId}"
+                                                       class="btn  btn-primary"
+                                                    >详情</a>
+                                                </td>
+
+                                            </tr>
+                                        </#list>
+
+
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                    <#--分页-->
+                    <#if username??>
+                    <#else >
+                        <div class="row clearfix">
+                            <div class="col-md-12 ">
+                                <nav aria-label="Page navigation example">
+                                    <ul class="pagination pull-right">
+                                        <#if currentPage lte 1>
+                                            <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
+                                        <#else>
+                                            <li class="page-item ">
+                                                <a class="page-link" href="${req.contextPath}/backstage_user/list?page=${currentPage - 1}&size=${size}">上一页</a>
+                                            </li>
+                                        </#if>
+
+                                        <#list 1..userInfo.getTotalPages() as index>
+                                            <#if currentPage == index>
+                                                <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
+                                                </li>
+                                            <#else>
+                                                <li class="page-item ">
+                                                    <a class="page-link"
+                                                       href="${req.contextPath}/backstage_user/list?page=${index}&size=${size}">${index}</a>
+                                                </li>
+                                            </#if>
+                                        </#list>
+
+                                        <#if currentPage gte userInfo.getTotalPages()>
+                                            <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+                                        <#else>
+                                            <li class="page-item ">
+                                                <a class="page-link"
+                                                   href="${req.contextPath}/backstage_user/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                            </li>
+                                        </#if>
+                                    </ul>
+                                </nav>
+
+                            </div>
+                        </div>
+                    </#if>
+<#--                    &lt;#&ndash;分页&ndash;&gt;-->
+<#--                    <#if username??>-->
+<#--                    <#else >-->
+<#--                        <div class="col-md-12 column">-->
+<#--                            <ul class="pagination pull-right">-->
+<#--                                <#if currentPage lte 1>-->
+<#--                                    <li class="disabled"><a href="#">上一页</a></li>-->
+<#--                                <#else>-->
+<#--                                    <li>-->
+<#--                                        <a href="${req.contextPath}/backstage_user/list?page=${currentPage - 1}&size=${size}">上一页</a>-->
+<#--                                    </li>-->
+<#--                                </#if>-->
+
+<#--                                <#list 1..userInfo.getTotalPages() as index>-->
+<#--                                    <#if currentPage == index>-->
+<#--                                        <li class="disabled"><a href="#">${index}</a></li>-->
+<#--                                    <#else>-->
+<#--                                        <li>-->
+<#--                                            <a href="${req.contextPath}/backstage_user/list?page=${index}&size=${size}">${index}</a>-->
+<#--                                        </li>-->
+<#--                                    </#if>-->
+<#--                                </#list>-->
+
+<#--                                <#if currentPage gte userInfo.getTotalPages()>-->
+<#--                                    <li class="disabled"><a href="#">下一页</a></li>-->
+<#--                                <#else>-->
+<#--                                    <li>-->
+<#--                                        <a href="${req.contextPath}/backstage_user/list?page=${currentPage + 1}&size=${size}">下一页</a>-->
+<#--                                    </li>-->
+<#--                                </#if>-->
+<#--                            </ul>-->
+<#--                        </div>-->
+
+<#--                    </#if>-->
+                </div>
+
+            </div>
+
+    </div>
+</div>
+
+<!-- jQuery and bootstrtap js -->
+<script src="../main-bundles/lib.vendor.bundle.js"></script>
+<!-- Start core js and page js -->
+<script src="../js/core.js"></script>
+</body>
+</html>

src/main/resources/templates/user/list.ftl

@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <#include "../common/header.ftl">
 <#setting number_format="#">
-<body class="font-opensans  sidebar_dark ">
+<body class="font-opensans">
 <!-- Page Loader -->
 <div class="page-loader-wrapper">
     <div class="loader">
@@ -11,188 +11,136 @@
 </div>
 <!-- Start main html -->
 <div id="main_content">
-    <#--边栏sidebar-->
-    <#include "../common/iconMenu.ftl">
-    <#--主菜单-->
-    <#include "../common/startMainMenu.ftl">
-    <div class="page">
-        <#assign title = "用户列表">
-        <#-- 顶部栏-->
-        <#include "../common/pageTop.ftl">
-
-            <#--    主要内容content-->
-            <div class="section-body">
-                <div class="container-fluid">
-                    <div class="row clearfix">
-                        <div class="col-md-12 ">
-                            <div class="card">
-                                <div class="card-header">
-                                    <h3 class="card-title">用户名字</h3>
-                                </div>
-                                <div class="card-body">
-                                    <form role="form" name="nickForm" method="post"
-                                          action="${req.contextPath}/backstage_user/searchUserInfo">
-                                        <div class="input-group mb-3 ">
-                                            <input type="text" class="form-control" name="username" value="${(username)!''}"/>
-                                            <#if username??>
-                                                <label>当前页数</label>
-                                                <input type="text" name="page" value="${currentPage}">
-                                                <input hidden type="text" name="size" value="${size}">
-                                            </#if>
-                                            <div class="input-group-append">
-                                                <button type="submit" class="btn btn-primary">查询</button>
-                                            </div>
-                                        </div>
-                                    </form>
-                                </div>
-                            </div>
-
-                        </div>
-                    </div>
-                    <div class="row clearfix">
-                        <div class="col-md-12 ">
-                            <div class="card">
-                                <div class="card-body">
-                                    <table class="table table-bordered table-hover">
-                                        <thead>
-                                        <tr>
-                                            <th>
-                                                用户id
-                                            </th>
-                                            <th>
-                                                头像
-                                            </th>
-                                            <th>
-                                                用户名
-                                            </th>
-                                            <th>
-                                                性别
-                                            </th>
-
-                                            <th>城市代码</th>
-
-                                            <th>详情</th>
-
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-
-                                        <#list userInfo.content as item>
-                                            <tr>
-
-                                                <td>
-                                                    ${item.userId}
-                                                </td>
-                                                <td>
-                                                    <img class="img-rounded " alt="" width="50" height="50"
-                                                         src="${(item.avatarUrl)!''}"/>
-                                                </td>
-                                                <td>
-                                                    ${item.username}
-                                                </td>
-                                                <td>
-                                                    ${item.gender}
-                                                </td>
-                                                <td>
-                                                    ${(item.cityCode)!''}
-                                                </td>
-                                                <td>
-                                                    <a href="${req.contextPath}/backstage_user/detail?userId=${item.userId}"
-                                                       class="btn  btn-primary"
-                                                    >详情</a>
-                                                </td>
-
-                                            </tr>
-                                        </#list>
-
-
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-
+    <div style="height: 10px;"></div>
+    <div class="container-fluid">
+        <div class="card">
+            <div class="card-header">
+                <h3 class="card-title">用户名字</h3>
+            </div>
+            <div class="card-body">
+                <form role="form" name="nickForm" method="post"
+                      action="${req.contextPath}/backstage_user/searchUserInfo">
+                    <div class="input-group mb-3 ">
+                        <input type="text" class="form-control" name="username"
+                               value="${(username)!''}"/>
+                        <#if username??>
+                            <label>当前页数</label>
+                            <input type="text" name="page" value="${currentPage}">
+                            <input hidden type="text" name="size" value="${size}">
+                        </#if>
+                        <div class="input-group-append">
+                            <button type="submit" class="btn btn-primary">查询</button>
                         </div>
                     </div>
-                    <#--分页-->
-                    <#if username??>
-                    <#else >
-                        <div class="row clearfix">
-                            <div class="col-md-12 ">
-                                <nav aria-label="Page navigation example">
-                                    <ul class="pagination pull-right">
-                                        <#if currentPage lte 1>
-                                            <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">上一页</a></li>
-                                        <#else>
-                                            <li class="page-item ">
-                                                <a class="page-link" href="${req.contextPath}/backstage_user/list?page=${currentPage - 1}&size=${size}">上一页</a>
-                                            </li>
-                                        </#if>
-
-                                        <#list 1..userInfo.getTotalPages() as index>
-                                            <#if currentPage == index>
-                                                <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">${index}</a>
-                                                </li>
-                                            <#else>
-                                                <li class="page-item ">
-                                                    <a class="page-link"
-                                                       href="${req.contextPath}/backstage_user/list?page=${index}&size=${size}">${index}</a>
-                                                </li>
-                                            </#if>
-                                        </#list>
-
-                                        <#if currentPage gte userInfo.getTotalPages()>
-                                            <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
-                                        <#else>
-                                            <li class="page-item ">
-                                                <a class="page-link"
-                                                   href="${req.contextPath}/backstage_user/list?page=${currentPage + 1}&size=${size}">下一页</a>
-                                            </li>
-                                        </#if>
-                                    </ul>
-                                </nav>
-
-                            </div>
-                        </div>
-                    </#if>
-<#--                    &lt;#&ndash;分页&ndash;&gt;-->
-<#--                    <#if username??>-->
-<#--                    <#else >-->
-<#--                        <div class="col-md-12 column">-->
-<#--                            <ul class="pagination pull-right">-->
-<#--                                <#if currentPage lte 1>-->
-<#--                                    <li class="disabled"><a href="#">上一页</a></li>-->
-<#--                                <#else>-->
-<#--                                    <li>-->
-<#--                                        <a href="${req.contextPath}/backstage_user/list?page=${currentPage - 1}&size=${size}">上一页</a>-->
-<#--                                    </li>-->
-<#--                                </#if>-->
-
-<#--                                <#list 1..userInfo.getTotalPages() as index>-->
-<#--                                    <#if currentPage == index>-->
-<#--                                        <li class="disabled"><a href="#">${index}</a></li>-->
-<#--                                    <#else>-->
-<#--                                        <li>-->
-<#--                                            <a href="${req.contextPath}/backstage_user/list?page=${index}&size=${size}">${index}</a>-->
-<#--                                        </li>-->
-<#--                                    </#if>-->
-<#--                                </#list>-->
-
-<#--                                <#if currentPage gte userInfo.getTotalPages()>-->
-<#--                                    <li class="disabled"><a href="#">下一页</a></li>-->
-<#--                                <#else>-->
-<#--                                    <li>-->
-<#--                                        <a href="${req.contextPath}/backstage_user/list?page=${currentPage + 1}&size=${size}">下一页</a>-->
-<#--                                    </li>-->
-<#--                                </#if>-->
-<#--                            </ul>-->
-<#--                        </div>-->
+                </form>
+            </div>
+        </div>
+        <div class="card">
+            <div class="card-body">
+                <table class="table table-bordered table-hover">
+                    <thead>
+                    <tr>
+                        <th>
+                            用户id
+                        </th>
+                        <th>
+                            头像
+                        </th>
+                        <th>
+                            用户名
+                        </th>
+                        <th>
+                            性别
+                        </th>
+
+                        <th>城市代码</th>
+
+                        <th>详情</th>
+
+                    </tr>
+                    </thead>
+                    <tbody>
+
+                    <#list userInfo.content as item>
+                        <tr>
+
+                            <td>
+                                ${item.userId}
+                            </td>
+                            <td>
+                                <img class="img-rounded " alt="" width="50" height="50"
+                                     src="${(item.avatarUrl)!''}"/>
+                            </td>
+                            <td>
+                                ${item.username}
+                            </td>
+                            <td>
+                                ${item.gender}
+                            </td>
+                            <td>
+                                ${(item.cityCode)!''}
+                            </td>
+                            <td>
+                                <a href="${req.contextPath}/backstage_user/detail?userId=${item.userId}"
+                                   class="btn  btn-primary"
+                                >详情</a>
+                            </td>
+
+                        </tr>
+                    </#list>
+
+
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <#--分页-->
+        <#if username??>
+        <#else >
+            <div class="row clearfix">
+                <div class="col-md-12 ">
+                    <nav aria-label="Page navigation example">
+                        <ul class="pagination pull-right">
+                            <#if currentPage lte 1>
+                                <li class="page-item disabled"><a class="page-link" href="#"
+                                                                  tabindex="-1">上一页</a></li>
+                            <#else>
+                                <li class="page-item ">
+                                    <a class="page-link"
+                                       href="${req.contextPath}/backstage_user/list?page=${currentPage - 1}&size=${size}">上一页</a>
+                                </li>
+                            </#if>
+
+                            <#list 1..userInfo.getTotalPages() as index>
+                                <#if currentPage == index>
+                                    <li class="page-item disabled"><a class="page-link" href="#"
+                                                                      tabindex="-1">${index}</a>
+                                    </li>
+                                <#else>
+                                    <li class="page-item ">
+                                        <a class="page-link"
+                                           href="${req.contextPath}/backstage_user/list?page=${index}&size=${size}">${index}</a>
+                                    </li>
+                                </#if>
+                            </#list>
+
+                            <#if currentPage gte userInfo.getTotalPages()>
+                                <li class="page-item "><a class="page-link" href="#" tabindex="-1">下一页</a></li>
+                            <#else>
+                                <li class="page-item ">
+                                    <a class="page-link"
+                                       href="${req.contextPath}/backstage_user/list?page=${currentPage + 1}&size=${size}">下一页</a>
+                                </li>
+                            </#if>
+                        </ul>
+                    </nav>
 
-<#--                    </#if>-->
                 </div>
-
             </div>
-
+        </#if>
     </div>
+
 </div>
 
 <!-- jQuery and bootstrtap js -->