From c5adc2eb35a1f1fb5c7f625c561ecc054ed9c63b Mon Sep 17 00:00:00 2001
From: shuzheng <469741414@qq.com>
Date: Mon, 13 Feb 2017 13:19:30 +0800
Subject: [PATCH] =?UTF-8?q?zheng-admin=E6=A8=A1=E5=9D=97=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BAzheng-ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   2 +-
 README.md                                     |   8 ++--
 project-datamodel/zheng.sql                   |   2 +-
 zheng-cms/zheng-cms-admin/pom.xml             |   2 +-
 .../src/main/resources/config.properties      |   2 +-
 .../main/resources/profiles/dev.properties    |   2 +-
 .../main/resources/profiles/pre.properties    |   2 +-
 .../main/resources/profiles/prod.properties   |   2 +-
 .../main/resources/profiles/test.properties   |   2 +-
 .../webapp/WEB-INF/jsp/manage/tag/index.jsp   |  22 +++++-----
 .../com/zheng/common/util/ZhengAdminUtil.java |  16 +++----
 zheng-ui/README.md                            |  14 ++++++
 zheng-ui/pom.xml                              |  40 ++++++++++++++++++
 {zheng-admin => zheng-ui}/src/crud.html       |   0
 {zheng-admin => zheng-ui}/src/css/admin.css   |   0
 {zheng-admin => zheng-ui}/src/css/common.css  |   0
 {zheng-admin => zheng-ui}/src/css/login.css   |   0
 {zheng-admin => zheng-ui}/src/data/data1.json |   0
 {zheng-admin => zheng-ui}/src/demo.html       |   0
 {zheng-admin => zheng-ui}/src/home.html       |   0
 .../src/images/ENTSANI.png                    | Bin
 .../src/images/avatar.jpg                     | Bin
 {zheng-admin => zheng-ui}/src/images/logo.png | Bin
 .../src/images/logo_image.png                 | Bin
 .../src/images/notifications.png              | Bin
 .../src/images/profile-menu.png               | Bin
 .../src/images/profile-menu3.png              | Bin
 {zheng-admin => zheng-ui}/src/images/zsz.psd  | Bin
 {zheng-admin => zheng-ui}/src/index.html      |   0
 {zheng-admin => zheng-ui}/src/js/admin.js     |   0
 {zheng-admin => zheng-ui}/src/js/common.js    |   0
 {zheng-admin => zheng-ui}/src/js/login.js     |   0
 {zheng-admin => zheng-ui}/src/login.html      |   0
 .../src/plugins/BootstrapMenu.min.js          |   0
 .../src/plugins/My97DatePicker/WdatePicker.js |   0
 .../src/plugins/My97DatePicker/calendar.js    |   0
 .../src/plugins/My97DatePicker/lang/en.js     |   0
 .../src/plugins/My97DatePicker/lang/zh-cn.js  |   0
 .../src/plugins/My97DatePicker/lang/zh-tw.js  |   0
 .../My97DatePicker/skin/WdatePicker.css       |   0
 .../My97DatePicker/skin/datePicker.gif        | Bin
 .../skin/default/datepicker.css               |   0
 .../My97DatePicker/skin/default/img.gif       | Bin
 .../My97DatePicker/skin/whyGreen/bg.jpg       | Bin
 .../skin/whyGreen/datepicker.css              |   0
 .../My97DatePicker/skin/whyGreen/img.gif      | Bin
 .../angular-1.5.8/angular-animate.min.js      |   0
 .../angular/angular-1.5.8/angular-aria.min.js |   0
 .../angular-1.5.8/angular-locale_zh-cn.js     |   0
 .../angular-1.5.8/angular-messages.min.js     |   0
 .../angular/angular-1.5.8/angular.min.js      |   0
 .../angular-material.min.css                  |   0
 .../angular-material.min.js                   |   0
 .../bootstrap-3.3.0/css/bootstrap-theme.css   |   0
 .../css/bootstrap-theme.css.map               |   0
 .../css/bootstrap-theme.min.css               |   0
 .../plugins/bootstrap-3.3.0/css/bootstrap.css |   0
 .../bootstrap-3.3.0/css/bootstrap.css.map     |   0
 .../bootstrap-3.3.0/css/bootstrap.min.css     |   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
 .../plugins/bootstrap-3.3.0/js/bootstrap.js   |   0
 .../bootstrap-3.3.0/js/bootstrap.min.js       |   0
 .../src/plugins/bootstrap-3.3.0/js/npm.js     |   0
 .../bootstrap-table.min.css                   |   0
 .../bootstrap-table.min.js                    |   0
 .../locale/bootstrap-table-en-US.js           |   0
 .../locale/bootstrap-table-en-US.min.js       |   0
 .../locale/bootstrap-table-zh-CN.js           |   0
 .../locale/bootstrap-table-zh-CN.min.js       |   0
 .../src/plugins/device.min.js                 |   0
 .../src/plugins/fastclick.min.js              |   0
 .../font-awesome-4.7.0/css/font-awesome.css   |   0
 .../css/font-awesome.min.css                  |   0
 .../font-awesome-4.7.0/fonts/FontAwesome.otf  | Bin
 .../fonts/fontawesome-webfont.eot             | Bin
 .../fonts/fontawesome-webfont.svg             |   0
 .../fonts/fontawesome-webfont.ttf             | Bin
 .../fonts/fontawesome-webfont.woff            | Bin
 .../fonts/fontawesome-webfont.woff2           | Bin
 .../src/plugins/fullPage/jquery.fullPage.css  |   0
 .../src/plugins/fullPage/jquery.fullPage.js   |   0
 .../plugins/fullPage/jquery.fullPage.min.js   |   0
 .../src/plugins/fullPage/jquery.jdirk.min.js  |   0
 .../src/plugins/jquery.1.12.4.min.js          |   0
 .../jquery.mCustomScrollbar.concat.min.js     |   0
 .../jquery.mCustomScrollbar.css               |   0
 .../jquery.mCustomScrollbar.js                |   0
 .../jquery.mCustomScrollbar.min.css           |   0
 .../mCSB_buttons.png                          | Bin
 .../css/material-design-iconic-font.css       |   0
 .../css/material-design-iconic-font.min.css   |   0
 .../fonts/Material-Design-Iconic-Font.eot     | Bin
 .../fonts/Material-Design-Iconic-Font.svg     |   0
 .../fonts/Material-Design-Iconic-Font.ttf     | Bin
 .../fonts/Material-Design-Iconic-Font.woff    | Bin
 .../fonts/Material-Design-Iconic-Font.woff2   | Bin
 .../src/plugins/waves-0.7.5/waves.css         |   0
 .../src/plugins/waves-0.7.5/waves.js          |   0
 .../src/plugins/waves-0.7.5/waves.min.css     |   0
 .../src/plugins/waves-0.7.5/waves.min.js      |   0
 .../src/plugins/waves-0.7.5/waves.min.js.map  |   0
 .../src/plugins/zheng.autoMail.1.0.min.js     |   0
 .../src/plugins/zheng.jprogress.0.1.min.js    |   0
 zheng-upms/zheng-upms-server/pom.xml          |   2 +-
 .../src/main/resources/config.properties      |   2 +-
 .../main/resources/profiles/dev.properties    |   2 +-
 .../main/resources/profiles/pre.properties    |   2 +-
 .../main/resources/profiles/prod.properties   |   2 +-
 .../main/resources/profiles/test.properties   |   2 +-
 .../main/webapp/WEB-INF/jsp/manage/index.jsp  |  26 ++++++------
 .../WEB-INF/jsp/manage/organization/index.jsp |  22 +++++-----
 .../WEB-INF/jsp/manage/permission/button.jsp  |  22 +++++-----
 .../WEB-INF/jsp/manage/permission/index.jsp   |  22 +++++-----
 .../WEB-INF/jsp/manage/permission/menu.jsp    |  22 +++++-----
 .../webapp/WEB-INF/jsp/manage/role/index.jsp  |  22 +++++-----
 .../WEB-INF/jsp/manage/system/index.jsp       |  22 +++++-----
 .../webapp/WEB-INF/jsp/manage/user/index.jsp  |  22 +++++-----
 .../src/main/webapp/WEB-INF/jsp/sso/login.jsp |  16 +++----
 121 files changed, 189 insertions(+), 135 deletions(-)
 create mode 100644 zheng-ui/README.md
 create mode 100644 zheng-ui/pom.xml
 rename {zheng-admin => zheng-ui}/src/crud.html (100%)
 rename {zheng-admin => zheng-ui}/src/css/admin.css (100%)
 rename {zheng-admin => zheng-ui}/src/css/common.css (100%)
 rename {zheng-admin => zheng-ui}/src/css/login.css (100%)
 rename {zheng-admin => zheng-ui}/src/data/data1.json (100%)
 rename {zheng-admin => zheng-ui}/src/demo.html (100%)
 rename {zheng-admin => zheng-ui}/src/home.html (100%)
 rename {zheng-admin => zheng-ui}/src/images/ENTSANI.png (100%)
 rename {zheng-admin => zheng-ui}/src/images/avatar.jpg (100%)
 rename {zheng-admin => zheng-ui}/src/images/logo.png (100%)
 rename {zheng-admin => zheng-ui}/src/images/logo_image.png (100%)
 rename {zheng-admin => zheng-ui}/src/images/notifications.png (100%)
 rename {zheng-admin => zheng-ui}/src/images/profile-menu.png (100%)
 rename {zheng-admin => zheng-ui}/src/images/profile-menu3.png (100%)
 rename {zheng-admin => zheng-ui}/src/images/zsz.psd (100%)
 rename {zheng-admin => zheng-ui}/src/index.html (100%)
 rename {zheng-admin => zheng-ui}/src/js/admin.js (100%)
 rename {zheng-admin => zheng-ui}/src/js/common.js (100%)
 rename {zheng-admin => zheng-ui}/src/js/login.js (100%)
 rename {zheng-admin => zheng-ui}/src/login.html (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/BootstrapMenu.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/WdatePicker.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/calendar.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/lang/en.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/lang/zh-cn.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/lang/zh-tw.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/skin/WdatePicker.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/skin/datePicker.gif (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/skin/default/datepicker.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/skin/default/img.gif (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/skin/whyGreen/bg.jpg (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/skin/whyGreen/datepicker.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/My97DatePicker/skin/whyGreen/img.gif (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/angular/angular-1.5.8/angular-animate.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/angular/angular-1.5.8/angular-aria.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/angular/angular-1.5.8/angular-locale_zh-cn.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/angular/angular-1.5.8/angular-messages.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/angular/angular-1.5.8/angular.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/angular/angular-material-1.1.1/angular-material.min.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/angular/angular-material-1.1.1/angular-material.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.css.map (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.min.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/css/bootstrap.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/css/bootstrap.css.map (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/css/bootstrap.min.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.eot (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.svg (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.woff (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/js/bootstrap.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/js/bootstrap.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-3.3.0/js/npm.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-en-US.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-en-US.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/device.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/fastclick.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/font-awesome-4.7.0/css/font-awesome.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/font-awesome-4.7.0/css/font-awesome.min.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/font-awesome-4.7.0/fonts/FontAwesome.otf (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.eot (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.svg (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.woff (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/fullPage/jquery.fullPage.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/fullPage/jquery.fullPage.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/fullPage/jquery.fullPage.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/fullPage/jquery.jdirk.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/jquery.1.12.4.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/malihu-custom-scrollbar-plugin/mCSB_buttons.png (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.eot (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.svg (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.ttf (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff2 (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/waves-0.7.5/waves.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/waves-0.7.5/waves.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/waves-0.7.5/waves.min.css (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/waves-0.7.5/waves.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/waves-0.7.5/waves.min.js.map (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/zheng.autoMail.1.0.min.js (100%)
 rename {zheng-admin => zheng-ui}/src/plugins/zheng.jprogress.0.1.min.js (100%)

diff --git a/.gitignore b/.gitignore
index 91fc8af7..720bf226 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,5 @@
 target
 *.log
 *.log.*
-**/resources/zheng-admin
+**/resources/zheng-ui
 generatorConfig.xml
\ No newline at end of file
diff --git a/README.md b/README.md
index 3a2d296c..7a80c696 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 ``` lua
 zheng
 ├── zheng-common -- SSM框架公共模块
-├── zheng-admin -- 后台管理系统模板（基于bootstrap实现的响应式Material Design风格的通用后台管理系统模板）
+├── zheng-ui -- 后台管理系统模板（基于bootstrap实现的响应式Material Design风格的通用后台管理系统模板）
 ├── zheng-upms -- 用户权限管理系统（网关）
 |    ├── zheng-upms-dao -- MyBatisGenerator代码生成模块，无需开发
 |    ├── zheng-upms-client -- 集成upms依赖包，提供单点认证、授权、会话管理
@@ -109,9 +109,9 @@ zheng
 
 Spring+SpringMVC+Mybatis框架集成公共模块，包括公共配置、MybatisGenerator扩展插件、通用BaseService、工具类等。[更多](zheng-common/README.md "更多")
 
-> zheng-admin
+> zheng-ui
 
-基于bootstrap实现的响应式Material Design风格的通用后台管理系统，`zheng`项目所有系统都是使用该模块界面作为前端展示。[更多](zheng-admin/README.md "更多")
+基于bootstrap实现的响应式Material Design风格的通用后台管理系统，`zheng`项目所有系统都是使用该模块界面作为前端展示。[更多](zheng-ui/README.md "更多")
 
 > zheng-upms
 
@@ -241,7 +241,7 @@ Spring+SpringMVC+Mybatis框架集成公共模块，包括公共配置、MybatisG
 
 ### 编译流程
 
-zheng-admin、zheng-common => zheng-oss、zheng-api => zheng-upms => 其他
+zheng-ui、zheng-common => zheng-oss、zheng-api => zheng-upms => 其他
 
 ### 启动顺序
 
diff --git a/project-datamodel/zheng.sql b/project-datamodel/zheng.sql
index 13f77800..3068b9de 100644
--- a/project-datamodel/zheng.sql
+++ b/project-datamodel/zheng.sql
@@ -599,7 +599,7 @@ CREATE TABLE `upms_user` (
 -- ----------------------------
 -- Records of upms_user
 -- ----------------------------
-INSERT INTO `upms_user` VALUES ('1', 'admin', '3038D9CB63B3152A79B8153FB06C02F7', '66f1b370c660445a8657bf8bf1794486', '张恕征', '/resources/zheng-admin/images/avatar.jpg', null, '469741414@qq.com', '1', '0', '1');
+INSERT INTO `upms_user` VALUES ('1', 'admin', '3038D9CB63B3152A79B8153FB06C02F7', '66f1b370c660445a8657bf8bf1794486', '张恕征', '/resources/zheng-ui/images/avatar.jpg', null, '469741414@qq.com', '1', '0', '1');
 
 -- ----------------------------
 -- Table structure for upms_user_organization
diff --git a/zheng-cms/zheng-cms-admin/pom.xml b/zheng-cms/zheng-cms-admin/pom.xml
index 4e5bdc27..9040a35f 100644
--- a/zheng-cms/zheng-cms-admin/pom.xml
+++ b/zheng-cms/zheng-cms-admin/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>com.zheng</groupId>
-            <artifactId>zheng-admin</artifactId>
+            <artifactId>zheng-ui</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/config.properties b/zheng-cms/zheng-cms-admin/src/main/resources/config.properties
index d222682e..47a8063d 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/config.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/config.properties
@@ -1,2 +1,2 @@
 env=${profile.env}
-zheng-admin.version=${zheng-admin.version}
\ No newline at end of file
+zheng-ui.version=${zheng-ui.version}
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties
index ac297b3b..7f3b2bdd 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties
@@ -1,4 +1,4 @@
 profile.env=dev
-zheng-admin.version=1.0.0
+zheng-ui.version=1.0.0
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties
index bd42591b..eadbd8f1 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties
@@ -1,4 +1,4 @@
 profile.env=pre
-zheng-admin.version=1.0.0
+zheng-ui.version=1.0.0
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties
index c1d4f565..5a28d305 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties
@@ -1,4 +1,4 @@
 profile.env=prod
-zheng-admin.version=1.0.0
+zheng-ui.version=1.0.0
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties
index a902b5e4..cd220125 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties
@@ -1,4 +1,4 @@
 profile.env=test
-zheng-admin.version=1.0.0
+zheng-ui.version=1.0.0
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/tag/index.jsp b/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/tag/index.jsp
index b7c32e68..2413b3e0 100644
--- a/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/tag/index.jsp
+++ b/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/tag/index.jsp
@@ -13,12 +13,12 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>标签列表</title>
 
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 </head>
 <body>
 <div id="main">
@@ -29,13 +29,13 @@
 	</div>
 	<table id="table"></table>
 </div>
-<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
 
-<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
+<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 <script>
 	$(function() {
 		// bootstrap table初始化
diff --git a/zheng-common/src/main/java/com/zheng/common/util/ZhengAdminUtil.java b/zheng-common/src/main/java/com/zheng/common/util/ZhengAdminUtil.java
index f83cfc0a..bcaa2429 100644
--- a/zheng-common/src/main/java/com/zheng/common/util/ZhengAdminUtil.java
+++ b/zheng-common/src/main/java/com/zheng/common/util/ZhengAdminUtil.java
@@ -22,15 +22,15 @@ public class ZhengAdminUtil implements InitializingBean, ServletContextAware {
 
     @Override
     public void setServletContext(ServletContext servletContext) {
-        _log.info("===== 开始解压zheng-admin =====");
-        String version = PropertiesFileUtil.getInstance().get("zheng-admin.version");
-        _log.info("zheng-admin.jar 版本: {}", version);
-        String jarPath = servletContext.getRealPath("/WEB-INF/lib/zheng-admin-" + version + ".jar");
-        _log.info("zheng-admin.jar 包路径: {}", jarPath);
-        String resources = servletContext.getRealPath("/resources") + "/zheng-admin";
-        _log.info("zheng-admin.jar 解压到: {}", resources);
+        _log.info("===== 开始解压zheng-ui =====");
+        String version = PropertiesFileUtil.getInstance().get("zheng-ui.version");
+        _log.info("zheng-ui.jar 版本: {}", version);
+        String jarPath = servletContext.getRealPath("/WEB-INF/lib/zheng-ui-" + version + ".jar");
+        _log.info("zheng-ui.jar 包路径: {}", jarPath);
+        String resources = servletContext.getRealPath("/resources") + "/zheng-ui";
+        _log.info("zheng-ui.jar 解压到: {}", resources);
         JarUtil.decompress(jarPath, resources);
-        _log.info("===== 解压zheng-admin完成 =====");
+        _log.info("===== 解压zheng-ui完成 =====");
     }
 
 }
diff --git a/zheng-ui/README.md b/zheng-ui/README.md
new file mode 100644
index 00000000..580eee84
--- /dev/null
+++ b/zheng-ui/README.md
@@ -0,0 +1,14 @@
+# zheng-ui
+
+基于bootstrap实现的响应式Material Design风格的通用后台管理系统
+
+# 在线演示
+
+地址： [http://www.zhangshuzheng.cn/zhengAdmin](http://www.zhangshuzheng.cn/zhengAdmin "zhengAdmin")
+
+
+![预览效果图](src/images/zheng-upms-crud.png)
+
+# License
+  MIT
+
diff --git a/zheng-ui/pom.xml b/zheng-ui/pom.xml
new file mode 100644
index 00000000..2fc48015
--- /dev/null
+++ b/zheng-ui/pom.xml
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.zheng</groupId>
+    <artifactId>zheng-ui</artifactId>
+    <version>1.0.0</version>
+    <packaging>jar</packaging>
+
+    <name>zheng-ui</name>
+    <url>http://www.zhangshuzheng.cn</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
+    </properties>
+
+    <build>
+        <finalName>zheng-ui</finalName>
+        <resources>
+            <resource>
+                <directory>src</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18.1</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/zheng-admin/src/crud.html b/zheng-ui/src/crud.html
similarity index 100%
rename from zheng-admin/src/crud.html
rename to zheng-ui/src/crud.html
diff --git a/zheng-admin/src/css/admin.css b/zheng-ui/src/css/admin.css
similarity index 100%
rename from zheng-admin/src/css/admin.css
rename to zheng-ui/src/css/admin.css
diff --git a/zheng-admin/src/css/common.css b/zheng-ui/src/css/common.css
similarity index 100%
rename from zheng-admin/src/css/common.css
rename to zheng-ui/src/css/common.css
diff --git a/zheng-admin/src/css/login.css b/zheng-ui/src/css/login.css
similarity index 100%
rename from zheng-admin/src/css/login.css
rename to zheng-ui/src/css/login.css
diff --git a/zheng-admin/src/data/data1.json b/zheng-ui/src/data/data1.json
similarity index 100%
rename from zheng-admin/src/data/data1.json
rename to zheng-ui/src/data/data1.json
diff --git a/zheng-admin/src/demo.html b/zheng-ui/src/demo.html
similarity index 100%
rename from zheng-admin/src/demo.html
rename to zheng-ui/src/demo.html
diff --git a/zheng-admin/src/home.html b/zheng-ui/src/home.html
similarity index 100%
rename from zheng-admin/src/home.html
rename to zheng-ui/src/home.html
diff --git a/zheng-admin/src/images/ENTSANI.png b/zheng-ui/src/images/ENTSANI.png
similarity index 100%
rename from zheng-admin/src/images/ENTSANI.png
rename to zheng-ui/src/images/ENTSANI.png
diff --git a/zheng-admin/src/images/avatar.jpg b/zheng-ui/src/images/avatar.jpg
similarity index 100%
rename from zheng-admin/src/images/avatar.jpg
rename to zheng-ui/src/images/avatar.jpg
diff --git a/zheng-admin/src/images/logo.png b/zheng-ui/src/images/logo.png
similarity index 100%
rename from zheng-admin/src/images/logo.png
rename to zheng-ui/src/images/logo.png
diff --git a/zheng-admin/src/images/logo_image.png b/zheng-ui/src/images/logo_image.png
similarity index 100%
rename from zheng-admin/src/images/logo_image.png
rename to zheng-ui/src/images/logo_image.png
diff --git a/zheng-admin/src/images/notifications.png b/zheng-ui/src/images/notifications.png
similarity index 100%
rename from zheng-admin/src/images/notifications.png
rename to zheng-ui/src/images/notifications.png
diff --git a/zheng-admin/src/images/profile-menu.png b/zheng-ui/src/images/profile-menu.png
similarity index 100%
rename from zheng-admin/src/images/profile-menu.png
rename to zheng-ui/src/images/profile-menu.png
diff --git a/zheng-admin/src/images/profile-menu3.png b/zheng-ui/src/images/profile-menu3.png
similarity index 100%
rename from zheng-admin/src/images/profile-menu3.png
rename to zheng-ui/src/images/profile-menu3.png
diff --git a/zheng-admin/src/images/zsz.psd b/zheng-ui/src/images/zsz.psd
similarity index 100%
rename from zheng-admin/src/images/zsz.psd
rename to zheng-ui/src/images/zsz.psd
diff --git a/zheng-admin/src/index.html b/zheng-ui/src/index.html
similarity index 100%
rename from zheng-admin/src/index.html
rename to zheng-ui/src/index.html
diff --git a/zheng-admin/src/js/admin.js b/zheng-ui/src/js/admin.js
similarity index 100%
rename from zheng-admin/src/js/admin.js
rename to zheng-ui/src/js/admin.js
diff --git a/zheng-admin/src/js/common.js b/zheng-ui/src/js/common.js
similarity index 100%
rename from zheng-admin/src/js/common.js
rename to zheng-ui/src/js/common.js
diff --git a/zheng-admin/src/js/login.js b/zheng-ui/src/js/login.js
similarity index 100%
rename from zheng-admin/src/js/login.js
rename to zheng-ui/src/js/login.js
diff --git a/zheng-admin/src/login.html b/zheng-ui/src/login.html
similarity index 100%
rename from zheng-admin/src/login.html
rename to zheng-ui/src/login.html
diff --git a/zheng-admin/src/plugins/BootstrapMenu.min.js b/zheng-ui/src/plugins/BootstrapMenu.min.js
similarity index 100%
rename from zheng-admin/src/plugins/BootstrapMenu.min.js
rename to zheng-ui/src/plugins/BootstrapMenu.min.js
diff --git a/zheng-admin/src/plugins/My97DatePicker/WdatePicker.js b/zheng-ui/src/plugins/My97DatePicker/WdatePicker.js
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/WdatePicker.js
rename to zheng-ui/src/plugins/My97DatePicker/WdatePicker.js
diff --git a/zheng-admin/src/plugins/My97DatePicker/calendar.js b/zheng-ui/src/plugins/My97DatePicker/calendar.js
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/calendar.js
rename to zheng-ui/src/plugins/My97DatePicker/calendar.js
diff --git a/zheng-admin/src/plugins/My97DatePicker/lang/en.js b/zheng-ui/src/plugins/My97DatePicker/lang/en.js
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/lang/en.js
rename to zheng-ui/src/plugins/My97DatePicker/lang/en.js
diff --git a/zheng-admin/src/plugins/My97DatePicker/lang/zh-cn.js b/zheng-ui/src/plugins/My97DatePicker/lang/zh-cn.js
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/lang/zh-cn.js
rename to zheng-ui/src/plugins/My97DatePicker/lang/zh-cn.js
diff --git a/zheng-admin/src/plugins/My97DatePicker/lang/zh-tw.js b/zheng-ui/src/plugins/My97DatePicker/lang/zh-tw.js
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/lang/zh-tw.js
rename to zheng-ui/src/plugins/My97DatePicker/lang/zh-tw.js
diff --git a/zheng-admin/src/plugins/My97DatePicker/skin/WdatePicker.css b/zheng-ui/src/plugins/My97DatePicker/skin/WdatePicker.css
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/skin/WdatePicker.css
rename to zheng-ui/src/plugins/My97DatePicker/skin/WdatePicker.css
diff --git a/zheng-admin/src/plugins/My97DatePicker/skin/datePicker.gif b/zheng-ui/src/plugins/My97DatePicker/skin/datePicker.gif
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/skin/datePicker.gif
rename to zheng-ui/src/plugins/My97DatePicker/skin/datePicker.gif
diff --git a/zheng-admin/src/plugins/My97DatePicker/skin/default/datepicker.css b/zheng-ui/src/plugins/My97DatePicker/skin/default/datepicker.css
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/skin/default/datepicker.css
rename to zheng-ui/src/plugins/My97DatePicker/skin/default/datepicker.css
diff --git a/zheng-admin/src/plugins/My97DatePicker/skin/default/img.gif b/zheng-ui/src/plugins/My97DatePicker/skin/default/img.gif
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/skin/default/img.gif
rename to zheng-ui/src/plugins/My97DatePicker/skin/default/img.gif
diff --git a/zheng-admin/src/plugins/My97DatePicker/skin/whyGreen/bg.jpg b/zheng-ui/src/plugins/My97DatePicker/skin/whyGreen/bg.jpg
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/skin/whyGreen/bg.jpg
rename to zheng-ui/src/plugins/My97DatePicker/skin/whyGreen/bg.jpg
diff --git a/zheng-admin/src/plugins/My97DatePicker/skin/whyGreen/datepicker.css b/zheng-ui/src/plugins/My97DatePicker/skin/whyGreen/datepicker.css
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/skin/whyGreen/datepicker.css
rename to zheng-ui/src/plugins/My97DatePicker/skin/whyGreen/datepicker.css
diff --git a/zheng-admin/src/plugins/My97DatePicker/skin/whyGreen/img.gif b/zheng-ui/src/plugins/My97DatePicker/skin/whyGreen/img.gif
similarity index 100%
rename from zheng-admin/src/plugins/My97DatePicker/skin/whyGreen/img.gif
rename to zheng-ui/src/plugins/My97DatePicker/skin/whyGreen/img.gif
diff --git a/zheng-admin/src/plugins/angular/angular-1.5.8/angular-animate.min.js b/zheng-ui/src/plugins/angular/angular-1.5.8/angular-animate.min.js
similarity index 100%
rename from zheng-admin/src/plugins/angular/angular-1.5.8/angular-animate.min.js
rename to zheng-ui/src/plugins/angular/angular-1.5.8/angular-animate.min.js
diff --git a/zheng-admin/src/plugins/angular/angular-1.5.8/angular-aria.min.js b/zheng-ui/src/plugins/angular/angular-1.5.8/angular-aria.min.js
similarity index 100%
rename from zheng-admin/src/plugins/angular/angular-1.5.8/angular-aria.min.js
rename to zheng-ui/src/plugins/angular/angular-1.5.8/angular-aria.min.js
diff --git a/zheng-admin/src/plugins/angular/angular-1.5.8/angular-locale_zh-cn.js b/zheng-ui/src/plugins/angular/angular-1.5.8/angular-locale_zh-cn.js
similarity index 100%
rename from zheng-admin/src/plugins/angular/angular-1.5.8/angular-locale_zh-cn.js
rename to zheng-ui/src/plugins/angular/angular-1.5.8/angular-locale_zh-cn.js
diff --git a/zheng-admin/src/plugins/angular/angular-1.5.8/angular-messages.min.js b/zheng-ui/src/plugins/angular/angular-1.5.8/angular-messages.min.js
similarity index 100%
rename from zheng-admin/src/plugins/angular/angular-1.5.8/angular-messages.min.js
rename to zheng-ui/src/plugins/angular/angular-1.5.8/angular-messages.min.js
diff --git a/zheng-admin/src/plugins/angular/angular-1.5.8/angular.min.js b/zheng-ui/src/plugins/angular/angular-1.5.8/angular.min.js
similarity index 100%
rename from zheng-admin/src/plugins/angular/angular-1.5.8/angular.min.js
rename to zheng-ui/src/plugins/angular/angular-1.5.8/angular.min.js
diff --git a/zheng-admin/src/plugins/angular/angular-material-1.1.1/angular-material.min.css b/zheng-ui/src/plugins/angular/angular-material-1.1.1/angular-material.min.css
similarity index 100%
rename from zheng-admin/src/plugins/angular/angular-material-1.1.1/angular-material.min.css
rename to zheng-ui/src/plugins/angular/angular-material-1.1.1/angular-material.min.css
diff --git a/zheng-admin/src/plugins/angular/angular-material-1.1.1/angular-material.min.js b/zheng-ui/src/plugins/angular/angular-material-1.1.1/angular-material.min.js
similarity index 100%
rename from zheng-admin/src/plugins/angular/angular-material-1.1.1/angular-material.min.js
rename to zheng-ui/src/plugins/angular/angular-material-1.1.1/angular-material.min.js
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.css b/zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.css
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.css
rename to zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.css
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.css.map b/zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.css.map
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.css.map
rename to zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.css.map
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.min.css b/zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.min.css
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.min.css
rename to zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap-theme.min.css
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap.css b/zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap.css
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap.css
rename to zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap.css
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap.css.map b/zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap.css.map
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap.css.map
rename to zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap.css.map
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap.min.css b/zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap.min.css
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/css/bootstrap.min.css
rename to zheng-ui/src/plugins/bootstrap-3.3.0/css/bootstrap.min.css
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.eot b/zheng-ui/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.eot
rename to zheng-ui/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.eot
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.svg b/zheng-ui/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.svg
rename to zheng-ui/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.svg
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.ttf b/zheng-ui/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.ttf
rename to zheng-ui/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.ttf
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.woff b/zheng-ui/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.woff
rename to zheng-ui/src/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.woff
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/js/bootstrap.js b/zheng-ui/src/plugins/bootstrap-3.3.0/js/bootstrap.js
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/js/bootstrap.js
rename to zheng-ui/src/plugins/bootstrap-3.3.0/js/bootstrap.js
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/js/bootstrap.min.js b/zheng-ui/src/plugins/bootstrap-3.3.0/js/bootstrap.min.js
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/js/bootstrap.min.js
rename to zheng-ui/src/plugins/bootstrap-3.3.0/js/bootstrap.min.js
diff --git a/zheng-admin/src/plugins/bootstrap-3.3.0/js/npm.js b/zheng-ui/src/plugins/bootstrap-3.3.0/js/npm.js
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-3.3.0/js/npm.js
rename to zheng-ui/src/plugins/bootstrap-3.3.0/js/npm.js
diff --git a/zheng-admin/src/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css b/zheng-ui/src/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css
rename to zheng-ui/src/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css
diff --git a/zheng-admin/src/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js b/zheng-ui/src/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js
rename to zheng-ui/src/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js
diff --git a/zheng-admin/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-en-US.js b/zheng-ui/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-en-US.js
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-en-US.js
rename to zheng-ui/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-en-US.js
diff --git a/zheng-admin/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-en-US.min.js b/zheng-ui/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-en-US.min.js
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-en-US.min.js
rename to zheng-ui/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-en-US.min.js
diff --git a/zheng-admin/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.js b/zheng-ui/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.js
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.js
rename to zheng-ui/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.js
diff --git a/zheng-admin/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js b/zheng-ui/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js
similarity index 100%
rename from zheng-admin/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js
rename to zheng-ui/src/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js
diff --git a/zheng-admin/src/plugins/device.min.js b/zheng-ui/src/plugins/device.min.js
similarity index 100%
rename from zheng-admin/src/plugins/device.min.js
rename to zheng-ui/src/plugins/device.min.js
diff --git a/zheng-admin/src/plugins/fastclick.min.js b/zheng-ui/src/plugins/fastclick.min.js
similarity index 100%
rename from zheng-admin/src/plugins/fastclick.min.js
rename to zheng-ui/src/plugins/fastclick.min.js
diff --git a/zheng-admin/src/plugins/font-awesome-4.7.0/css/font-awesome.css b/zheng-ui/src/plugins/font-awesome-4.7.0/css/font-awesome.css
similarity index 100%
rename from zheng-admin/src/plugins/font-awesome-4.7.0/css/font-awesome.css
rename to zheng-ui/src/plugins/font-awesome-4.7.0/css/font-awesome.css
diff --git a/zheng-admin/src/plugins/font-awesome-4.7.0/css/font-awesome.min.css b/zheng-ui/src/plugins/font-awesome-4.7.0/css/font-awesome.min.css
similarity index 100%
rename from zheng-admin/src/plugins/font-awesome-4.7.0/css/font-awesome.min.css
rename to zheng-ui/src/plugins/font-awesome-4.7.0/css/font-awesome.min.css
diff --git a/zheng-admin/src/plugins/font-awesome-4.7.0/fonts/FontAwesome.otf b/zheng-ui/src/plugins/font-awesome-4.7.0/fonts/FontAwesome.otf
similarity index 100%
rename from zheng-admin/src/plugins/font-awesome-4.7.0/fonts/FontAwesome.otf
rename to zheng-ui/src/plugins/font-awesome-4.7.0/fonts/FontAwesome.otf
diff --git a/zheng-admin/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.eot b/zheng-ui/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
similarity index 100%
rename from zheng-admin/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
rename to zheng-ui/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
diff --git a/zheng-admin/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.svg b/zheng-ui/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
similarity index 100%
rename from zheng-admin/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
rename to zheng-ui/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
diff --git a/zheng-admin/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf b/zheng-ui/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from zheng-admin/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
rename to zheng-ui/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
diff --git a/zheng-admin/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.woff b/zheng-ui/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
similarity index 100%
rename from zheng-admin/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
rename to zheng-ui/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
diff --git a/zheng-admin/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 b/zheng-ui/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from zheng-admin/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2
rename to zheng-ui/src/plugins/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2
diff --git a/zheng-admin/src/plugins/fullPage/jquery.fullPage.css b/zheng-ui/src/plugins/fullPage/jquery.fullPage.css
similarity index 100%
rename from zheng-admin/src/plugins/fullPage/jquery.fullPage.css
rename to zheng-ui/src/plugins/fullPage/jquery.fullPage.css
diff --git a/zheng-admin/src/plugins/fullPage/jquery.fullPage.js b/zheng-ui/src/plugins/fullPage/jquery.fullPage.js
similarity index 100%
rename from zheng-admin/src/plugins/fullPage/jquery.fullPage.js
rename to zheng-ui/src/plugins/fullPage/jquery.fullPage.js
diff --git a/zheng-admin/src/plugins/fullPage/jquery.fullPage.min.js b/zheng-ui/src/plugins/fullPage/jquery.fullPage.min.js
similarity index 100%
rename from zheng-admin/src/plugins/fullPage/jquery.fullPage.min.js
rename to zheng-ui/src/plugins/fullPage/jquery.fullPage.min.js
diff --git a/zheng-admin/src/plugins/fullPage/jquery.jdirk.min.js b/zheng-ui/src/plugins/fullPage/jquery.jdirk.min.js
similarity index 100%
rename from zheng-admin/src/plugins/fullPage/jquery.jdirk.min.js
rename to zheng-ui/src/plugins/fullPage/jquery.jdirk.min.js
diff --git a/zheng-admin/src/plugins/jquery.1.12.4.min.js b/zheng-ui/src/plugins/jquery.1.12.4.min.js
similarity index 100%
rename from zheng-admin/src/plugins/jquery.1.12.4.min.js
rename to zheng-ui/src/plugins/jquery.1.12.4.min.js
diff --git a/zheng-admin/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js b/zheng-ui/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js
similarity index 100%
rename from zheng-admin/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js
rename to zheng-ui/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js
diff --git a/zheng-admin/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css b/zheng-ui/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css
similarity index 100%
rename from zheng-admin/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css
rename to zheng-ui/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css
diff --git a/zheng-admin/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.js b/zheng-ui/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.js
similarity index 100%
rename from zheng-admin/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.js
rename to zheng-ui/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.js
diff --git a/zheng-admin/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css b/zheng-ui/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css
similarity index 100%
rename from zheng-admin/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css
rename to zheng-ui/src/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css
diff --git a/zheng-admin/src/plugins/malihu-custom-scrollbar-plugin/mCSB_buttons.png b/zheng-ui/src/plugins/malihu-custom-scrollbar-plugin/mCSB_buttons.png
similarity index 100%
rename from zheng-admin/src/plugins/malihu-custom-scrollbar-plugin/mCSB_buttons.png
rename to zheng-ui/src/plugins/malihu-custom-scrollbar-plugin/mCSB_buttons.png
diff --git a/zheng-admin/src/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.css b/zheng-ui/src/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.css
similarity index 100%
rename from zheng-admin/src/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.css
rename to zheng-ui/src/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.css
diff --git a/zheng-admin/src/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css b/zheng-ui/src/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css
similarity index 100%
rename from zheng-admin/src/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css
rename to zheng-ui/src/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css
diff --git a/zheng-admin/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.eot b/zheng-ui/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.eot
similarity index 100%
rename from zheng-admin/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.eot
rename to zheng-ui/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.eot
diff --git a/zheng-admin/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.svg b/zheng-ui/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.svg
similarity index 100%
rename from zheng-admin/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.svg
rename to zheng-ui/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.svg
diff --git a/zheng-admin/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.ttf b/zheng-ui/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.ttf
similarity index 100%
rename from zheng-admin/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.ttf
rename to zheng-ui/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.ttf
diff --git a/zheng-admin/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff b/zheng-ui/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff
similarity index 100%
rename from zheng-admin/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff
rename to zheng-ui/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff
diff --git a/zheng-admin/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff2 b/zheng-ui/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff2
similarity index 100%
rename from zheng-admin/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff2
rename to zheng-ui/src/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff2
diff --git a/zheng-admin/src/plugins/waves-0.7.5/waves.css b/zheng-ui/src/plugins/waves-0.7.5/waves.css
similarity index 100%
rename from zheng-admin/src/plugins/waves-0.7.5/waves.css
rename to zheng-ui/src/plugins/waves-0.7.5/waves.css
diff --git a/zheng-admin/src/plugins/waves-0.7.5/waves.js b/zheng-ui/src/plugins/waves-0.7.5/waves.js
similarity index 100%
rename from zheng-admin/src/plugins/waves-0.7.5/waves.js
rename to zheng-ui/src/plugins/waves-0.7.5/waves.js
diff --git a/zheng-admin/src/plugins/waves-0.7.5/waves.min.css b/zheng-ui/src/plugins/waves-0.7.5/waves.min.css
similarity index 100%
rename from zheng-admin/src/plugins/waves-0.7.5/waves.min.css
rename to zheng-ui/src/plugins/waves-0.7.5/waves.min.css
diff --git a/zheng-admin/src/plugins/waves-0.7.5/waves.min.js b/zheng-ui/src/plugins/waves-0.7.5/waves.min.js
similarity index 100%
rename from zheng-admin/src/plugins/waves-0.7.5/waves.min.js
rename to zheng-ui/src/plugins/waves-0.7.5/waves.min.js
diff --git a/zheng-admin/src/plugins/waves-0.7.5/waves.min.js.map b/zheng-ui/src/plugins/waves-0.7.5/waves.min.js.map
similarity index 100%
rename from zheng-admin/src/plugins/waves-0.7.5/waves.min.js.map
rename to zheng-ui/src/plugins/waves-0.7.5/waves.min.js.map
diff --git a/zheng-admin/src/plugins/zheng.autoMail.1.0.min.js b/zheng-ui/src/plugins/zheng.autoMail.1.0.min.js
similarity index 100%
rename from zheng-admin/src/plugins/zheng.autoMail.1.0.min.js
rename to zheng-ui/src/plugins/zheng.autoMail.1.0.min.js
diff --git a/zheng-admin/src/plugins/zheng.jprogress.0.1.min.js b/zheng-ui/src/plugins/zheng.jprogress.0.1.min.js
similarity index 100%
rename from zheng-admin/src/plugins/zheng.jprogress.0.1.min.js
rename to zheng-ui/src/plugins/zheng.jprogress.0.1.min.js
diff --git a/zheng-upms/zheng-upms-server/pom.xml b/zheng-upms/zheng-upms-server/pom.xml
index d1a67221..342a304d 100644
--- a/zheng-upms/zheng-upms-server/pom.xml
+++ b/zheng-upms/zheng-upms-server/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>com.zheng</groupId>
-            <artifactId>zheng-admin</artifactId>
+            <artifactId>zheng-ui</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/config.properties b/zheng-upms/zheng-upms-server/src/main/resources/config.properties
index d222682e..47a8063d 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/config.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/config.properties
@@ -1,2 +1,2 @@
 env=${profile.env}
-zheng-admin.version=${zheng-admin.version}
\ No newline at end of file
+zheng-ui.version=${zheng-ui.version}
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties
index b3ba3b19..05de9162 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties
@@ -1,2 +1,2 @@
 profile.env=dev
-zheng-admin.version=1.0.0
\ No newline at end of file
+zheng-ui.version=1.0.0
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties
index c29c616a..0ecf3f89 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties
@@ -1,2 +1,2 @@
 profile.env=pre
-zheng-admin.version=1.0.0
\ No newline at end of file
+zheng-ui.version=1.0.0
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties
index f54e4c11..63aa8440 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties
@@ -1,2 +1,2 @@
 profile.env=prod
-zheng-admin.version=1.0.0
\ No newline at end of file
+zheng-ui.version=1.0.0
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties
index 1a83db21..c2eaebb4 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties
@@ -1,2 +1,2 @@
 profile.env=test
-zheng-admin.version=1.0.0
\ No newline at end of file
+zheng-ui.version=1.0.0
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/index.jsp
index a6282c36..9b0ed43f 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/index.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/index.jsp
@@ -14,11 +14,11 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>用户权限管理系统</title>
 
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/css/admin.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/css/admin.css" rel="stylesheet"/>
 </head>
 <body>
 <header id="header">
@@ -32,7 +32,7 @@
 		</li>
 		<li id="logo" class="hidden-xs">
 			<a href="${basePath}/manage/index">
-				<img src="${basePath}/resources/zheng-admin/images/logo.png"/>
+				<img src="${basePath}/resources/zheng-ui/images/logo.png"/>
 			</a>
 			<span id="system_title">权限管理系统</span>
 		</li>
@@ -190,12 +190,12 @@
 </section>
 <footer id="footer"></footer>
 
-<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/BootstrapMenu.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/device.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/js/admin.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/BootstrapMenu.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/device.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/js/admin.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp
index 42766881..ad2b3d92 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp
@@ -13,11 +13,11 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>组织管理</title>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 </head>
 <body>
 <div id="main">
@@ -28,12 +28,12 @@
 	</div>
 	<table id="table"></table>
 </div>
-<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 <script>
 $(function() {
 	// bootstrap table初始化
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/button.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/button.jsp
index 93976edc..9591f542 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/button.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/button.jsp
@@ -13,11 +13,11 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>权限管理</title>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 </head>
 <body>
 <div id="main">
@@ -28,12 +28,12 @@
 	</div>
 	<table id="table"></table>
 </div>
-<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 <script>
 $(function() {
 	// bootstrap table初始化
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/index.jsp
index 386ea898..3b02b231 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/index.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/index.jsp
@@ -13,11 +13,11 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>权限管理</title>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 </head>
 <body>
 <div id="main">
@@ -28,12 +28,12 @@
 	</div>
 	<table id="table"></table>
 </div>
-<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 <script>
 $(function() {
 	// bootstrap table初始化
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/menu.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/menu.jsp
index d2ccdd8b..05e7c2f2 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/menu.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/menu.jsp
@@ -13,11 +13,11 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>权限管理</title>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 </head>
 <body>
 <div id="main">
@@ -28,12 +28,12 @@
 	</div>
 	<table id="table"></table>
 </div>
-<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 <script>
 $(function() {
 	// bootstrap table初始化
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
index 929ce2ab..a3531188 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
@@ -13,11 +13,11 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>角色管理</title>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 </head>
 <body>
 <div id="main">
@@ -28,12 +28,12 @@
 	</div>
 	<table id="table"></table>
 </div>
-<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 <script>
 $(function() {
 	// bootstrap table初始化
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp
index 9e72d7d1..bc2cff51 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp
@@ -13,11 +13,11 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>系统管理</title>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 </head>
 <body>
 <div id="main">
@@ -28,12 +28,12 @@
 	</div>
 	<table id="table"></table>
 </div>
-<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 <script>
 $(function() {
 	// bootstrap table初始化
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp
index c1bb86e1..b15e3052 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp
@@ -13,11 +13,11 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>用户管理</title>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+	<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
 </head>
 <body>
 <div id="main">
@@ -28,12 +28,12 @@
 	</div>
 	<table id="table"></table>
 </div>
-<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
 <script>
 $(function() {
 	// bootstrap table初始化
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/sso/login.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/sso/login.jsp
index fcf2e476..aabf51a1 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/sso/login.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/sso/login.jsp
@@ -14,10 +14,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>登录页</title>
 
-    <link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
-    <link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
-    <link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
-    <link href="${basePath}/resources/zheng-admin/css/login.css" rel="stylesheet"/>
+    <link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
+    <link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
+    <link href="${basePath}/resources/zheng-ui/css/login.css" rel="stylesheet"/>
 </head>
 <body>
 <div id="login-window">
@@ -44,11 +44,11 @@
     </div>
     <a id="login-bt" href="javascript:;" class="waves-effect waves-button waves-float"><i class="zmdi zmdi-arrow-forward"></i></a>
 </div>
-<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
+<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
 
-<script src="${basePath}/resources/zheng-admin/js/login.js"></script>
+<script src="${basePath}/resources/zheng-ui/js/login.js"></script>
 <script>
     $(function() {
         // 点击登录按钮