From 10bff54005c87ef13365677836ffa7db114919ce Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Mon, 7 Nov 2016 11:23:04 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E5=8F=98=E6=9B=B4=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/public/base.html             |   6 +++---
 application/admin/view/public/jump.html             |   2 +-
 application/admin/view/user/login.html              |   6 +++---
 application/config.php                              |   1 +
 .../{ => plugin}/bootstrap/css/bootstrap.min.css    |   0
 .../bootstrap/css/bootstrap.min.css.map             |   0
 .../fonts/glyphicons-halflings-regular.eot          | Bin
 .../fonts/glyphicons-halflings-regular.svg          |   0
 .../fonts/glyphicons-halflings-regular.ttf          | Bin
 .../fonts/glyphicons-halflings-regular.woff         | Bin
 .../fonts/glyphicons-halflings-regular.woff2        | Bin
 .../{ => plugin}/bootstrap/js/bootstrap.min.js      |   0
 public/static/{ => plugin}/jQuery/1.12.4/jquery.js  |   0
 .../static/{ => plugin}/jQuery/1.12.4/jquery.min.js |   0
 .../{ => plugin}/jQuery/1.12.4/jquery.min.map       |   0
 public/static/{ => plugin}/jQuery/2.2.4/jquery.js   |   0
 .../static/{ => plugin}/jQuery/2.2.4/jquery.min.js  |   0
 public/static/{ => plugin}/jQuery/3.1.1/jquery.js   |   0
 .../static/{ => plugin}/jQuery/3.1.1/jquery.min.js  |   0
 .../static/{ => plugin}/jQuery/3.1.1/jquery.min.map |   0
 .../static/{ => plugin}/jQuery/3.1.1/jquery.slim.js |   0
 .../{ => plugin}/jQuery/3.1.1/jquery.slim.min.js    |   0
 .../{ => plugin}/jQuery/3.1.1/jquery.slim.min.map   |   0
 23 files changed, 8 insertions(+), 7 deletions(-)
 rename public/static/{ => plugin}/bootstrap/css/bootstrap.min.css (100%)
 rename public/static/{ => plugin}/bootstrap/css/bootstrap.min.css.map (100%)
 rename public/static/{ => plugin}/bootstrap/fonts/glyphicons-halflings-regular.eot (100%)
 rename public/static/{ => plugin}/bootstrap/fonts/glyphicons-halflings-regular.svg (100%)
 rename public/static/{ => plugin}/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%)
 rename public/static/{ => plugin}/bootstrap/fonts/glyphicons-halflings-regular.woff (100%)
 rename public/static/{ => plugin}/bootstrap/fonts/glyphicons-halflings-regular.woff2 (100%)
 rename public/static/{ => plugin}/bootstrap/js/bootstrap.min.js (100%)
 rename public/static/{ => plugin}/jQuery/1.12.4/jquery.js (100%)
 rename public/static/{ => plugin}/jQuery/1.12.4/jquery.min.js (100%)
 rename public/static/{ => plugin}/jQuery/1.12.4/jquery.min.map (100%)
 rename public/static/{ => plugin}/jQuery/2.2.4/jquery.js (100%)
 rename public/static/{ => plugin}/jQuery/2.2.4/jquery.min.js (100%)
 rename public/static/{ => plugin}/jQuery/3.1.1/jquery.js (100%)
 rename public/static/{ => plugin}/jQuery/3.1.1/jquery.min.js (100%)
 rename public/static/{ => plugin}/jQuery/3.1.1/jquery.min.map (100%)
 rename public/static/{ => plugin}/jQuery/3.1.1/jquery.slim.js (100%)
 rename public/static/{ => plugin}/jQuery/3.1.1/jquery.slim.min.js (100%)
 rename public/static/{ => plugin}/jQuery/3.1.1/jquery.slim.min.map (100%)

diff --git a/application/admin/view/public/base.html b/application/admin/view/public/base.html
index 470fadc..039c083 100644
--- a/application/admin/view/public/base.html
+++ b/application/admin/view/public/base.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>{:config('PRODUCT_NAME')} | {block name="title"}{$title}{/block}</title>
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-    <link rel="stylesheet" href="__STATIC__/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="__PLUGIN__/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="//cdn.bootcss.com/font-awesome/4.5.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="//cdn.bootcss.com/ionicons/2.0.1/css/ionicons.min.css">
     <link rel="stylesheet" href="__ADMIN__/dist/css/AdminLTE.min.css">
@@ -582,9 +582,9 @@
         <div class="control-sidebar-bg"></div>
     </div>
     <!-- jQuery 2.2.3 -->
-    <script src="__STATIC__/jQuery/2.2.4/jquery.min.js"></script>
+    <script src="__PLUGIN__/jQuery/2.2.4/jquery.min.js"></script>
     <!-- Bootstrap 3.3.6 -->
-    <script src="__STATIC__/bootstrap/js/bootstrap.min.js"></script>
+    <script src="__PLUGIN__/bootstrap/js/bootstrap.min.js"></script>
     <!-- FastClick -->
     <script src="__ADMIN__/plugins/fastclick/fastclick.js"></script>
     <!-- BootBox -->
diff --git a/application/admin/view/public/jump.html b/application/admin/view/public/jump.html
index ea84e62..540f432 100644
--- a/application/admin/view/public/jump.html
+++ b/application/admin/view/public/jump.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>7D - 跳转提示</title>
-    <script src="__STATIC__/jQuery/3.1.1/jquery.min.js"></script>
+    <script src="__PLUGIN__/jQuery/3.1.1/jquery.min.js"></script>
     <link href="//cdn.bootcss.com/semantic-ui/2.2.6/semantic.min.css" rel="stylesheet">
     <script src="//cdn.bootcss.com/semantic-ui/2.2.6/semantic.js"></script>
     <link rel="icon" href="__ADMIN__/dist/img/favicon.ico">
diff --git a/application/admin/view/user/login.html b/application/admin/view/user/login.html
index a359615..69b384e 100644
--- a/application/admin/view/user/login.html
+++ b/application/admin/view/user/login.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>{:config('PRODUCT_NAME')} | 登 录</title>
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-    <link rel="stylesheet" href="__STATIC__/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="__PLUGIN__/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="__ADMIN__/dist/css/AdminLTE.min.css">
     <link rel="icon" href="__ADMIN__/dist/img/favicon.ico">
     <!--[if lt IE 9]>
@@ -42,9 +42,9 @@
 </div>
 
 <!-- jQuery 2.2.3 -->
-<script src="__STATIC__/jQuery/2.2.4/jquery.min.js"></script>
+<script src="__PLUGIN__/jQuery/2.2.4/jquery.min.js"></script>
 <!-- Bootstrap 3.3.6 -->
-<script src="__STATIC__/bootstrap/js/bootstrap.min.js"></script>
+<script src="__PLUGIN__/bootstrap/js/bootstrap.min.js"></script>
 <!-- BootBox -->
 <script src="__ADMIN__/plugins/bootBox/bootbox.min.js"></script>
 
diff --git a/application/config.php b/application/config.php
index 1c11889..8a35afe 100644
--- a/application/config.php
+++ b/application/config.php
@@ -141,6 +141,7 @@ return [
         '__STATIC__'=>'/static',
         '__INDEX__'=>'/static/index',
         '__ADMIN__'=>'/static/admin',
+        '__PLUGIN__'=>'/static/plugin',
     ],
     // 默认跳转页面对应的模板文件
     'dispatch_success_tmpl'  => 'public/jump',
diff --git a/public/static/bootstrap/css/bootstrap.min.css b/public/static/plugin/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from public/static/bootstrap/css/bootstrap.min.css
rename to public/static/plugin/bootstrap/css/bootstrap.min.css
diff --git a/public/static/bootstrap/css/bootstrap.min.css.map b/public/static/plugin/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from public/static/bootstrap/css/bootstrap.min.css.map
rename to public/static/plugin/bootstrap/css/bootstrap.min.css.map
diff --git a/public/static/bootstrap/fonts/glyphicons-halflings-regular.eot b/public/static/plugin/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from public/static/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to public/static/plugin/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/public/static/bootstrap/fonts/glyphicons-halflings-regular.svg b/public/static/plugin/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from public/static/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to public/static/plugin/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/public/static/bootstrap/fonts/glyphicons-halflings-regular.ttf b/public/static/plugin/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from public/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to public/static/plugin/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/public/static/bootstrap/fonts/glyphicons-halflings-regular.woff b/public/static/plugin/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from public/static/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to public/static/plugin/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/public/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/public/static/plugin/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from public/static/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to public/static/plugin/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/public/static/bootstrap/js/bootstrap.min.js b/public/static/plugin/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from public/static/bootstrap/js/bootstrap.min.js
rename to public/static/plugin/bootstrap/js/bootstrap.min.js
diff --git a/public/static/jQuery/1.12.4/jquery.js b/public/static/plugin/jQuery/1.12.4/jquery.js
similarity index 100%
rename from public/static/jQuery/1.12.4/jquery.js
rename to public/static/plugin/jQuery/1.12.4/jquery.js
diff --git a/public/static/jQuery/1.12.4/jquery.min.js b/public/static/plugin/jQuery/1.12.4/jquery.min.js
similarity index 100%
rename from public/static/jQuery/1.12.4/jquery.min.js
rename to public/static/plugin/jQuery/1.12.4/jquery.min.js
diff --git a/public/static/jQuery/1.12.4/jquery.min.map b/public/static/plugin/jQuery/1.12.4/jquery.min.map
similarity index 100%
rename from public/static/jQuery/1.12.4/jquery.min.map
rename to public/static/plugin/jQuery/1.12.4/jquery.min.map
diff --git a/public/static/jQuery/2.2.4/jquery.js b/public/static/plugin/jQuery/2.2.4/jquery.js
similarity index 100%
rename from public/static/jQuery/2.2.4/jquery.js
rename to public/static/plugin/jQuery/2.2.4/jquery.js
diff --git a/public/static/jQuery/2.2.4/jquery.min.js b/public/static/plugin/jQuery/2.2.4/jquery.min.js
similarity index 100%
rename from public/static/jQuery/2.2.4/jquery.min.js
rename to public/static/plugin/jQuery/2.2.4/jquery.min.js
diff --git a/public/static/jQuery/3.1.1/jquery.js b/public/static/plugin/jQuery/3.1.1/jquery.js
similarity index 100%
rename from public/static/jQuery/3.1.1/jquery.js
rename to public/static/plugin/jQuery/3.1.1/jquery.js
diff --git a/public/static/jQuery/3.1.1/jquery.min.js b/public/static/plugin/jQuery/3.1.1/jquery.min.js
similarity index 100%
rename from public/static/jQuery/3.1.1/jquery.min.js
rename to public/static/plugin/jQuery/3.1.1/jquery.min.js
diff --git a/public/static/jQuery/3.1.1/jquery.min.map b/public/static/plugin/jQuery/3.1.1/jquery.min.map
similarity index 100%
rename from public/static/jQuery/3.1.1/jquery.min.map
rename to public/static/plugin/jQuery/3.1.1/jquery.min.map
diff --git a/public/static/jQuery/3.1.1/jquery.slim.js b/public/static/plugin/jQuery/3.1.1/jquery.slim.js
similarity index 100%
rename from public/static/jQuery/3.1.1/jquery.slim.js
rename to public/static/plugin/jQuery/3.1.1/jquery.slim.js
diff --git a/public/static/jQuery/3.1.1/jquery.slim.min.js b/public/static/plugin/jQuery/3.1.1/jquery.slim.min.js
similarity index 100%
rename from public/static/jQuery/3.1.1/jquery.slim.min.js
rename to public/static/plugin/jQuery/3.1.1/jquery.slim.min.js
diff --git a/public/static/jQuery/3.1.1/jquery.slim.min.map b/public/static/plugin/jQuery/3.1.1/jquery.slim.min.map
similarity index 100%
rename from public/static/jQuery/3.1.1/jquery.slim.min.map
rename to public/static/plugin/jQuery/3.1.1/jquery.slim.min.map