更新demo的包结构

guns-vip-main/src/main/java/cn/stylefeng/guns/modular/demos/controller/ExcelController.java

@@ -55,7 +55,7 @@ public class ExcelController {
      */
      */
     @RequestMapping("/import")
     @RequestMapping("/import")
     public String importIndex() {
     public String importIndex() {
-        return "/modular/demos/excel_import.html";
+        return "/demos/excel_import.html";
     }
     }
 
 
     /**
     /**

guns-vip-main/src/main/java/cn/stylefeng/guns/modular/demos/controller/PdfPreviewController.java

@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Slf4j
 @Slf4j
 public class PdfPreviewController extends BaseController {
 public class PdfPreviewController extends BaseController {
 
 
-    private String PREFIX = "/modular/demos/pdf/";
+    private String PREFIX = "/demos/pdf/";
 
 
     /**
     /**
      * pdf预览
      * pdf预览

guns-vip-main/src/main/java/cn/stylefeng/guns/modular/form/controller/EgFormController.java

@@ -24,7 +24,7 @@ import java.util.ArrayList;
 @RequestMapping("/egForm")
 @RequestMapping("/egForm")
 public class EgFormController extends BaseController {
 public class EgFormController extends BaseController {
 
 
-    private String PREFIX = "/modular/demos/form";
+    private String PREFIX = "/form";
 
 
     /**
     /**
      * 跳转到主页面
      * 跳转到主页面

guns-vip-main/src/main/resources/application.yml

@@ -18,11 +18,6 @@ spring:
   mvc:
   mvc:
     view:
     view:
       prefix: /pages
       prefix: /pages
-  devtools:
-    restart:
-      enabled: false
-      additional-paths: src/main/java
-      exclude: assets/**,pages/**
   servlet:
   servlet:
     multipart:
     multipart:
       max-request-size: 100MB
       max-request-size: 100MB

guns-vip-main/src/main/webapp/assets/demos/excel_import.js

-layui.use(['layer', 'assets.form.form', 'table', 'ztree', 'laydate', 'admin', 'ax','upload'], function () {
+layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax','upload'], function () {
     var layer = layui.layer;
     var layer = layui.layer;
     var form = layui.form;
     var form = layui.form;
     var table = layui.table;
     var table = layui.table;

guns-vip-main/src/main/webapp/assets/form/egForm_add.js

@@ -17,7 +17,7 @@ var EgFormInfoDlg = {
     }
     }
 };
 };
 
 
-layui.use(['assets.form.form', 'admin', 'ax', 'upload', 'laydate', 'selectPlus'], function () {
+layui.use(['form', 'admin', 'ax', 'upload', 'laydate', 'selectPlus'], function () {
     var $ = layui.jquery;
     var $ = layui.jquery;
     var $ax = layui.ax;
     var $ax = layui.ax;
     var form = layui.form;
     var form = layui.form;

guns-vip-main/src/main/webapp/pages/demos/excel_import.html

-@layout("/common/_container.html",{plugins:["ztree"],js:["/assets/modular/demos/excel_import.js"]}){
+@layout("/common/_container.html",{plugins:["ztree"],js:["/assets/demos/excel_import.js"]}){
 
 
 <div class="layui-body-header">
 <div class="layui-body-header">
     <span class="layui-body-header-title">用户管理</span>
     <span class="layui-body-header-title">用户管理</span>

guns-vip-main/src/main/webapp/pages/form/egForm.html

-@layout("/common/_container.html",{js:["/assets/modular/demos/form/egForm.js"],css:["/assets/modular/demos/form/form.css"]}){
+@layout("/common/_container.html",{js:["/assets/form/egForm.js"],css:["/assets/form/form.css"]}){
 
 
 <div class="layui-body-header">
 <div class="layui-body-header">
     <span class="layui-body-header-title">Guns复杂表单的示例管理</span>
     <span class="layui-body-header-title">Guns复杂表单的示例管理</span>

guns-vip-main/src/main/webapp/pages/form/egForm_add.html

-@layout("/common/_container.html",{js:["/assets/modular/demos/form/egForm_add.js"]}){
+@layout("/common/_container.html",{js:["/assets/form/egForm_add.js"]}){
 
 
 <div class="layui-body-header">
 <div class="layui-body-header">
     <span class="layui-body-header-title">表单的示例-添加</span>
     <span class="layui-body-header-title">表单的示例-添加</span>