From ce8adda79d9b7e7ec627d2d08904312234736605 Mon Sep 17 00:00:00 2001
From: zhengxinonly <pyxxponly@gmail.com>
Date: Thu, 22 Jul 2021 00:57:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor(api):=E8=B0=83=E6=95=B4=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/templates/{admin => }/common/footer.html     | 0
 applications/templates/{admin => }/common/header.html     | 0
 applications/templates/{admin => }/department/add.html    | 4 ++--
 applications/templates/{admin => }/department/edit.html   | 4 ++--
 applications/templates/{admin => }/department/main.html   | 4 ++--
 applications/templates/{admin => }/file/photo.html        | 4 ++--
 .../{admin/index.html => index/admin_index.html}          | 2 +-
 applications/templates/{admin => index}/login.html        | 2 +-
 .../templates/{admin/console => index}/welcome.html       | 4 ++--
 .../templates/{admin/admin_log => logs_temp}/main.html    | 4 ++--
 applications/templates/{admin => }/rights/add.html        | 4 ++--
 applications/templates/{admin => }/rights/edit.html       | 4 ++--
 applications/templates/{admin => }/rights/main.html       | 4 ++--
 applications/templates/{admin/role => roles}/add.html     | 4 ++--
 applications/templates/{admin/role => roles}/edit.html    | 4 ++--
 applications/templates/{admin/role => roles}/main.html    | 4 ++--
 applications/templates/{admin/role => roles}/power.html   | 4 ++--
 applications/templates/{admin/user => users}/add.html     | 4 ++--
 applications/templates/{admin/user => users}/avatar.html  | 4 ++--
 .../templates/{admin/user => users}/edit_password.html    | 4 ++--
 .../templates/{admin/user => users}/edit_users.html       | 4 ++--
 applications/templates/{admin/user => users}/main.html    | 4 ++--
 applications/templates/{admin/user => users}/profile.html | 4 ++--
 applications/view/department/__init__.py                  | 6 +++---
 applications/view/file/__init__.py                        | 2 +-
 applications/view/index/__init__.py                       | 4 ++--
 applications/view/logs_view/__init__.py                   | 2 +-
 applications/view/passport/api.py                         | 2 +-
 applications/view/rights/__init__.py                      | 2 +-
 applications/view/rights/right.py                         | 4 ++--
 applications/view/roles/__init__.py                       | 4 ++--
 applications/view/roles/role.py                           | 4 ++--
 applications/view/users/__init__.py                       | 4 ++--
 applications/view/users/profile.py                        | 4 ++--
 applications/view/users/user_view.py                      | 8 ++++----
 35 files changed, 63 insertions(+), 63 deletions(-)
 rename applications/templates/{admin => }/common/footer.html (100%)
 rename applications/templates/{admin => }/common/header.html (100%)
 rename applications/templates/{admin => }/department/add.html (98%)
 rename applications/templates/{admin => }/department/edit.html (98%)
 rename applications/templates/{admin => }/department/main.html (98%)
 rename applications/templates/{admin => }/file/photo.html (98%)
 rename applications/templates/{admin/index.html => index/admin_index.html} (99%)
 rename applications/templates/{admin => index}/login.html (98%)
 rename applications/templates/{admin/console => index}/welcome.html (99%)
 rename applications/templates/{admin/admin_log => logs_temp}/main.html (97%)
 rename applications/templates/{admin => }/rights/add.html (98%)
 rename applications/templates/{admin => }/rights/edit.html (98%)
 rename applications/templates/{admin => }/rights/main.html (98%)
 rename applications/templates/{admin/role => roles}/add.html (97%)
 rename applications/templates/{admin/role => roles}/edit.html (97%)
 rename applications/templates/{admin/role => roles}/main.html (98%)
 rename applications/templates/{admin/role => roles}/power.html (95%)
 rename applications/templates/{admin/user => users}/add.html (97%)
 rename applications/templates/{admin/user => users}/avatar.html (97%)
 rename applications/templates/{admin/user => users}/edit_password.html (96%)
 rename applications/templates/{admin/user => users}/edit_users.html (97%)
 rename applications/templates/{admin/user => users}/main.html (99%)
 rename applications/templates/{admin/user => users}/profile.html (99%)

diff --git a/applications/templates/admin/common/footer.html b/applications/templates/common/footer.html
similarity index 100%
rename from applications/templates/admin/common/footer.html
rename to applications/templates/common/footer.html
diff --git a/applications/templates/admin/common/header.html b/applications/templates/common/header.html
similarity index 100%
rename from applications/templates/admin/common/header.html
rename to applications/templates/common/header.html
diff --git a/applications/templates/admin/department/add.html b/applications/templates/department/add.html
similarity index 98%
rename from applications/templates/admin/department/add.html
rename to applications/templates/department/add.html
index 27a4484..36db667 100644
--- a/applications/templates/admin/department/add.html
+++ b/applications/templates/department/add.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>部门管理</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
 </head>
 <body>
 <form class="layui-form" action="">
@@ -80,7 +80,7 @@
         </div>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['form', 'jquery', 'dtree'], function () {
     let form = layui.form
diff --git a/applications/templates/admin/department/edit.html b/applications/templates/department/edit.html
similarity index 98%
rename from applications/templates/admin/department/edit.html
rename to applications/templates/department/edit.html
index 017a043..f540ae5 100644
--- a/applications/templates/admin/department/edit.html
+++ b/applications/templates/department/edit.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>部门修改</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
 </head>
 <body>
 <form class="layui-form" action="">
@@ -91,7 +91,7 @@
         </div>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['form', 'jquery'], function () {
     let form = layui.form
diff --git a/applications/templates/admin/department/main.html b/applications/templates/department/main.html
similarity index 98%
rename from applications/templates/admin/department/main.html
rename to applications/templates/department/main.html
index 61b27d3..f30b20a 100644
--- a/applications/templates/admin/department/main.html
+++ b/applications/templates/department/main.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>部门新增</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
 </head>
 {#pear 后台边框#}
 <body class="pear-container">
@@ -73,7 +73,7 @@
 
 </body>
 
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 
 <script>
   layui.use(['table', 'form', 'jquery', 'treetable', 'popup'], function () {
diff --git a/applications/templates/admin/file/photo.html b/applications/templates/file/photo.html
similarity index 98%
rename from applications/templates/admin/file/photo.html
rename to applications/templates/file/photo.html
index ffe736b..98b7623 100644
--- a/applications/templates/admin/file/photo.html
+++ b/applications/templates/file/photo.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>图片上传</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
 </head>
 <body class="pear-container">
 <div class="layui-card">
@@ -60,7 +60,7 @@
     {{ '  {{layui.util.toDateString(d.create_time,  "yyyy-MM-dd HH:mm:ss")}' |safe }}}
 </script>
 
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['table', 'form', 'jquery', 'element', 'form', 'upload'], function () {
     let table = layui.table
diff --git a/applications/templates/admin/index.html b/applications/templates/index/admin_index.html
similarity index 99%
rename from applications/templates/admin/index.html
rename to applications/templates/index/admin_index.html
index 37957e4..17f6e37 100644
--- a/applications/templates/admin/index.html
+++ b/applications/templates/index/admin_index.html
@@ -77,7 +77,7 @@
     <div class="loader"></div>
 </div>
 <!-- 依 赖 脚 本 -->
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['admin', 'jquery', 'layer', 'popup'], function () {
     let admin = layui.admin
diff --git a/applications/templates/admin/login.html b/applications/templates/index/login.html
similarity index 98%
rename from applications/templates/admin/login.html
rename to applications/templates/index/login.html
index fc18b93..1da87db 100644
--- a/applications/templates/admin/login.html
+++ b/applications/templates/index/login.html
@@ -37,7 +37,7 @@
         </button>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['form', 'jquery', 'layer', 'button', 'popup'], function () {
     let form = layui.form
diff --git a/applications/templates/admin/console/welcome.html b/applications/templates/index/welcome.html
similarity index 99%
rename from applications/templates/admin/console/welcome.html
rename to applications/templates/index/welcome.html
index e266b68..c4a2da5 100644
--- a/applications/templates/admin/console/welcome.html
+++ b/applications/templates/index/welcome.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>首页</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
     <link rel="stylesheet" href="{{ url_for('static', filename='/admin/admin/css/other/console1.css') }}"/>
 
     <!-- 主 题 更 换 -->
@@ -291,7 +291,7 @@
     </div>
 </div>
 <!--</div>-->
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['layer', 'echarts', 'element', 'count'], function () {
     var $ = layui.jquery,
diff --git a/applications/templates/admin/admin_log/main.html b/applications/templates/logs_temp/main.html
similarity index 97%
rename from applications/templates/admin/admin_log/main.html
rename to applications/templates/logs_temp/main.html
index ea6eca9..7af8ceb 100644
--- a/applications/templates/admin/admin_log/main.html
+++ b/applications/templates/logs_temp/main.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>日志</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
     <link rel="stylesheet" href="{{ url_for('static', filename='/admin/admin/css/other/console2.css') }}"/>
 </head>
 <body class="pear-container">
@@ -38,7 +38,7 @@
     <span style="color: red">失败</span>
     {{# } }}'|safe }}
 </script>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['table', 'form', 'jquery', 'element', 'util'], function () {
     let table = layui.table
diff --git a/applications/templates/admin/rights/add.html b/applications/templates/rights/add.html
similarity index 98%
rename from applications/templates/admin/rights/add.html
rename to applications/templates/rights/add.html
index af895e0..99edee7 100644
--- a/applications/templates/admin/rights/add.html
+++ b/applications/templates/rights/add.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>权限</title>
-    {% include 'admin/common/header.html' %}</head>
+    {% include 'common/header.html' %}</head>
 </head>
 <body>
 <form class="layui-form" action="">
@@ -83,7 +83,7 @@
         </div>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['form', 'jquery', 'iconPicker', 'dtree'], function () {
     let form = layui.form
diff --git a/applications/templates/admin/rights/edit.html b/applications/templates/rights/edit.html
similarity index 98%
rename from applications/templates/admin/rights/edit.html
rename to applications/templates/rights/edit.html
index aa71e43..0ef546b 100644
--- a/applications/templates/admin/rights/edit.html
+++ b/applications/templates/rights/edit.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>权限编辑</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
 </head>
 <body>
 <form class="layui-form" action="">
@@ -95,7 +95,7 @@
         </div>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['form', 'jquery', 'iconPicker', 'dtree'], function () {
     let form = layui.form
diff --git a/applications/templates/admin/rights/main.html b/applications/templates/rights/main.html
similarity index 98%
rename from applications/templates/admin/rights/main.html
rename to applications/templates/rights/main.html
index d6184ab..8f01d46 100644
--- a/applications/templates/admin/rights/main.html
+++ b/applications/templates/rights/main.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>权限</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
 </head>
 <body class="pear-container">
 <div class="layui-card">
@@ -83,7 +83,7 @@
 </script>
 
 </body>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['table', 'form', 'jquery', 'treetable', 'popup'], function () {
     let table = layui.table
diff --git a/applications/templates/admin/role/add.html b/applications/templates/roles/add.html
similarity index 97%
rename from applications/templates/admin/role/add.html
rename to applications/templates/roles/add.html
index 2e64121..cf3935c 100644
--- a/applications/templates/admin/role/add.html
+++ b/applications/templates/roles/add.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>角色新增</title>
-    {% include 'admin/common/header.html' %}</head>
+    {% include 'common/header.html' %}</head>
 <body>
 <form class="layui-form" action="">
     <div class="mainBox">
@@ -58,7 +58,7 @@
         </div>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['form', 'jquery'], function () {
     let form = layui.form
diff --git a/applications/templates/admin/role/edit.html b/applications/templates/roles/edit.html
similarity index 97%
rename from applications/templates/admin/role/edit.html
rename to applications/templates/roles/edit.html
index 2ed6a41..f3e6aa4 100644
--- a/applications/templates/admin/role/edit.html
+++ b/applications/templates/roles/edit.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>角色编辑</title>
-    {% include 'admin/common/header.html' %}</head>
+    {% include 'common/header.html' %}</head>
 <body>
 <form class="layui-form" action="">
     <div class="mainBox">
@@ -70,7 +70,7 @@
         </div>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['form', 'jquery'], function () {
     let form = layui.form
diff --git a/applications/templates/admin/role/main.html b/applications/templates/roles/main.html
similarity index 98%
rename from applications/templates/admin/role/main.html
rename to applications/templates/roles/main.html
index 921d870..64f7027 100644
--- a/applications/templates/admin/role/main.html
+++ b/applications/templates/roles/main.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>角色管理</title>
-    {% include 'admin/common/header.html' %}</head>
+    {% include 'common/header.html' %}</head>
 <body class="pear-container">
 <div class="layui-card">
     <div class="layui-card-body">
@@ -72,7 +72,7 @@
     <input type="checkbox" name="enable" value="{{ "{{d.id}}" }}" lay-skin="switch" lay-text="启用|禁用"
            lay-filter="role-enable" {{ "{{# if(d.enable==1){ }} checked {{# } }}" }}>
 </script>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['table', 'form', 'jquery', 'popup', 'common'], function () {
     let table = layui.table
diff --git a/applications/templates/admin/role/power.html b/applications/templates/roles/power.html
similarity index 95%
rename from applications/templates/admin/role/power.html
rename to applications/templates/roles/power.html
index cfbae9b..c83e639 100644
--- a/applications/templates/admin/role/power.html
+++ b/applications/templates/roles/power.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>角色授权</title>
-    {% include 'admin/common/header.html' %}</head>
+    {% include 'common/header.html' %}</head>
 <body>
 <form class="layui-form" action="">
     <div class="mainBox">
@@ -25,7 +25,7 @@
         </div>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['dtree', 'form', 'jquery'], function () {
     let dtree = layui.dtree
diff --git a/applications/templates/admin/user/add.html b/applications/templates/users/add.html
similarity index 97%
rename from applications/templates/admin/user/add.html
rename to applications/templates/users/add.html
index c55a262..005905e 100644
--- a/applications/templates/admin/user/add.html
+++ b/applications/templates/users/add.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>用户管理</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
 </head>
 <body>
 <form class="layui-form">
@@ -59,7 +59,7 @@
         </div>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['form', 'jquery'], function () {
     let form = layui.form
diff --git a/applications/templates/admin/user/avatar.html b/applications/templates/users/avatar.html
similarity index 97%
rename from applications/templates/admin/user/avatar.html
rename to applications/templates/users/avatar.html
index 8ecacfa..da03e97 100644
--- a/applications/templates/admin/user/avatar.html
+++ b/applications/templates/users/avatar.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>头像上传</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
 </head>
 <body class="pear-container">
 <div class="layui-row layui-col-space15">
@@ -34,7 +34,7 @@
     </div>
 </div>
 </body>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['jquery', 'layer', 'cropper', 'popup'], function () {
     let $ = layui.jquery
diff --git a/applications/templates/admin/user/edit_password.html b/applications/templates/users/edit_password.html
similarity index 96%
rename from applications/templates/admin/user/edit_password.html
rename to applications/templates/users/edit_password.html
index d8fd674..fae762d 100644
--- a/applications/templates/admin/user/edit_password.html
+++ b/applications/templates/users/edit_password.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>修改密码</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
 </head>
 <body>
 <form class="layui-form" action="">
@@ -47,7 +47,7 @@
         </div>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['form', 'jquery', 'popup'], function () {
     let form = layui.form
diff --git a/applications/templates/admin/user/edit_users.html b/applications/templates/users/edit_users.html
similarity index 97%
rename from applications/templates/admin/user/edit_users.html
rename to applications/templates/users/edit_users.html
index 6dc6fd9..5ab5653 100644
--- a/applications/templates/admin/user/edit_users.html
+++ b/applications/templates/users/edit_users.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
     <title>用户编辑</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
 </head>
 <body>
 <form class="layui-form" action="">
@@ -68,7 +68,7 @@
         </div>
     </div>
 </form>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['form', 'jquery', 'dtree'], function () {
     let form = layui.form
diff --git a/applications/templates/admin/user/main.html b/applications/templates/users/main.html
similarity index 99%
rename from applications/templates/admin/user/main.html
rename to applications/templates/users/main.html
index d2e350d..d94f8c3 100644
--- a/applications/templates/admin/user/main.html
+++ b/applications/templates/users/main.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <title>用户管理</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
     <link rel="stylesheet" href="{{ url_for('static', filename='/admin/admin/css/other/user.css') }}"/>
 </head>
 <body class="pear-container">
@@ -101,7 +101,7 @@
     {{ '  {{layui.util.toDateString(d.update_at,  "yyyy-MM-dd HH:mm:ss")}' |safe }}}
 </script>
 
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 
 <script>
   layui.use(['table', 'dtree', 'form', 'jquery', 'popup', 'common'], function () {
diff --git a/applications/templates/admin/user/profile.html b/applications/templates/users/profile.html
similarity index 99%
rename from applications/templates/admin/user/profile.html
rename to applications/templates/users/profile.html
index 6e56cc5..6b8742b 100644
--- a/applications/templates/admin/user/profile.html
+++ b/applications/templates/users/profile.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>个人中心</title>
-    {% include 'admin/common/header.html' %}
+    {% include 'common/header.html' %}
     <style>
         .layui-form-item {
             margin-top: 17px !important;
@@ -170,7 +170,7 @@
         </div>
     </div>
 </div>
-{% include 'admin/common/footer.html' %}
+{% include 'common/footer.html' %}
 <script>
   layui.use(['element', 'jquery', 'layer', 'form'], function () {
     let $ = layui.jquery
diff --git a/applications/view/department/__init__.py b/applications/view/department/__init__.py
index 3a4bf0e..a912917 100644
--- a/applications/view/department/__init__.py
+++ b/applications/view/department/__init__.py
@@ -14,7 +14,7 @@ dept_api = Api(dept_bp)
 @dept_bp.get('/')
 @authorize("admin:dept:main", log=True)
 def main():
-    return render_template('admin/department/main.html')
+    return render_template('department/main.html')
 
 
 @dept_bp.get('/data')
@@ -32,7 +32,7 @@ def data():
 class AddDepartment(Resource):
     @authorize("admin:dept:add", log=True)
     def get(self):
-        return make_response(render_template('admin/department/add.html'))
+        return make_response(render_template('department/add.html'))
 
     @authorize("admin:dept:add", log=True)
     def post(self):
@@ -98,7 +98,7 @@ class DeptURD(Resource):
     @authorize("admin:dept:edit", log=True)
     def get(self, dept_id):
         dept = Dept.query.filter_by(id=dept_id).first()
-        return make_response(render_template('admin/department/edit.html', dept=dept))
+        return make_response(render_template('department/edit.html', dept=dept))
 
     @authorize("admin:dept:edit", log=True)
     def put(self, dept_id):
diff --git a/applications/view/file/__init__.py b/applications/view/file/__init__.py
index 0c566f4..0793b4f 100644
--- a/applications/view/file/__init__.py
+++ b/applications/view/file/__init__.py
@@ -17,7 +17,7 @@ file_bp = Blueprint('file', __name__, url_prefix='/file')
 @file_bp.get('/')
 @authorize("admin:file:main", log=True)
 def index():
-    return render_template('admin/file/photo.html')
+    return render_template('file/photo.html')
 
 
 #  图片数据
diff --git a/applications/view/index/__init__.py b/applications/view/index/__init__.py
index 3fc4835..ebdb873 100644
--- a/applications/view/index/__init__.py
+++ b/applications/view/index/__init__.py
@@ -14,11 +14,11 @@ def index():
 @index_bp.get('/admin')
 @login_required
 def admin_index():
-    return render_template('admin/index.html', user=current_user)
+    return render_template('index/admin_index.html', user=current_user)
 
 
 # 控制台页面
 @index_bp.get('/admin/welcome')
 @login_required
 def welcome():
-    return render_template('admin/console/welcome.html')
+    return render_template('index/welcome.html')
diff --git a/applications/view/logs_view/__init__.py b/applications/view/logs_view/__init__.py
index 5243301..5a9dd9d 100644
--- a/applications/view/logs_view/__init__.py
+++ b/applications/view/logs_view/__init__.py
@@ -13,7 +13,7 @@ logs_bp = Blueprint('logs', __name__, url_prefix='/logs')
 @logs_bp.get('/')
 @authorize("admin:log:main")
 def index():
-    return render_template('admin/admin_log/main.html')
+    return render_template('logs_temp/main.html')
 
 
 @logs_bp.get('/login_log')
diff --git a/applications/view/passport/api.py b/applications/view/passport/api.py
index ba41d07..f1505a4 100644
--- a/applications/view/passport/api.py
+++ b/applications/view/passport/api.py
@@ -23,7 +23,7 @@ class Login(Resource):
         if current_user.is_authenticated:
             return redirect(url_for('admin.index'))
         # TODO 分离视图操作 最终实现接口登录与视图登录两套逻辑
-        return make_response(render_template('admin/login.html'))
+        return make_response(render_template('index/login.html'))
 
     def post(self):
 
diff --git a/applications/view/rights/__init__.py b/applications/view/rights/__init__.py
index b048f07..8184896 100644
--- a/applications/view/rights/__init__.py
+++ b/applications/view/rights/__init__.py
@@ -10,7 +10,7 @@ rights_api = Api(rights_bp)
 @rights_bp.get('/')
 @authorize("admin:power:main", log=True)
 def index():
-    return render_template('admin/rights/main.html')
+    return render_template('rights/main.html')
 
 
 from . import routes
diff --git a/applications/view/rights/right.py b/applications/view/rights/right.py
index 04b1116..b681c4c 100644
--- a/applications/view/rights/right.py
+++ b/applications/view/rights/right.py
@@ -79,7 +79,7 @@ class AddRight(Resource):
     @authorize("admin:power:add", log=True)
     def get(self):
         """获取增加视图"""
-        return make_response(render_template('admin/rights/add.html'))
+        return make_response(render_template('rights/add.html'))
 
     @authorize("admin:power:add", log=True)
     def post(self):
@@ -115,7 +115,7 @@ class RightsURD(Resource):
             icon = icon[1]
         else:
             icon = None
-        return make_response(render_template('admin/rights/edit.html', power=power, icon=icon))
+        return make_response(render_template('rights/edit.html', power=power, icon=icon))
 
     @authorize("admin:power:remove", log=True)
     def delete(self, power_id):
diff --git a/applications/view/roles/__init__.py b/applications/view/roles/__init__.py
index cb75587..7b59958 100644
--- a/applications/view/roles/__init__.py
+++ b/applications/view/roles/__init__.py
@@ -11,14 +11,14 @@ role_bp = Blueprint('role', __name__, url_prefix='/admin/role')
 @role_bp.get('/')
 @authorize("admin:role:main", log=True)
 def main():
-    return render_template('admin/role/main.html')
+    return render_template('roles/main.html')
 
 
 # 角色授权操作
 @role_bp.get('/power/<int:_id>')
 @authorize("admin:role:power", log=True)
 def power(_id):
-    return render_template('admin/role/power.html', id=_id)
+    return render_template('roles/power.html', id=_id)
 
 
 from . import role
\ No newline at end of file
diff --git a/applications/view/roles/role.py b/applications/view/roles/role.py
index bc311ef..3823137 100644
--- a/applications/view/roles/role.py
+++ b/applications/view/roles/role.py
@@ -55,7 +55,7 @@ def table():
 class AddRole(Resource):
     @authorize("admin:role:add", log=True)
     def get(self):
-        return make_response(render_template('admin/role/add.html'))
+        return make_response(render_template('roles/add.html'))
 
     @authorize("admin:role:add", log=True)
     def post(self):
@@ -147,7 +147,7 @@ class EditRole(Resource):
     @authorize("admin:role:edit", log=True)
     def get(self, role_id):
         role = Role.query.filter_by(id=role_id).first()
-        return make_response(render_template('admin/role/edit.html', role=role))
+        return make_response(render_template('roles/edit.html', role=role))
 
     # 更新角色
     @authorize("admin:role:edit", log=True)
diff --git a/applications/view/users/__init__.py b/applications/view/users/__init__.py
index 71b9b0f..396d1f1 100644
--- a/applications/view/users/__init__.py
+++ b/applications/view/users/__init__.py
@@ -13,7 +13,7 @@ users_bp = Blueprint('users', __name__, url_prefix='/users')
 @users_bp.get('/')
 @authorize("admin:user:main", log=True)
 def get():
-    return render_template('admin/user/main.html')
+    return render_template('users/main.html')
 
 
 @users_bp.get('/center')
@@ -21,7 +21,7 @@ def get():
 def center():
     user_logs = AdminLog.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
         desc(AdminLog.create_time)).limit(10)
-    return render_template('admin/user/profile.html', user_info=current_user, user_logs=user_logs)
+    return render_template('users/profile.html', user_info=current_user, user_logs=user_logs)
 
 
 user_api = Api(users_bp)
diff --git a/applications/view/users/profile.py b/applications/view/users/profile.py
index f80a320..d4691aa 100644
--- a/applications/view/users/profile.py
+++ b/applications/view/users/profile.py
@@ -17,7 +17,7 @@ class Avatar(Resource):
     """修改头像"""
 
     def get(self):
-        return make_response(render_template('admin/user/avatar.html'))
+        return make_response(render_template('users/avatar.html'))
 
     def put(self):
         url = request.json.get("avatar").get("src")
@@ -53,7 +53,7 @@ class EditPassword(Resource):
 
     @login_required
     def get(self):
-        return make_response(render_template('admin/user/edit_password.html'))
+        return make_response(render_template('users/edit_password.html'))
 
     @login_required
     def put(self):
diff --git a/applications/view/users/user_view.py b/applications/view/users/user_view.py
index 62e6ae4..bc39abe 100644
--- a/applications/view/users/user_view.py
+++ b/applications/view/users/user_view.py
@@ -18,7 +18,7 @@ class Users(Resource):
     @authorize("admin:user:add", log=True)
     def get(self):
         roles = Role.query.all()
-        return make_response(render_template('admin/user/add.html', roles=roles))
+        return make_response(render_template('users/add.html', roles=roles))
 
     @authorize("admin:user:add", log=True)
     def post(self):
@@ -66,9 +66,9 @@ class CURDUser(Resource):
         for r in user.role:
             checked_roles.append(r.id)
         return make_response(
-            render_template('admin/user/edit_users.html', user=user, roles=roles, checked_roles=checked_roles))
+            render_template('users/edit_users.html', user=user, roles=roles, checked_roles=checked_roles))
 
-    @authorize("admin:user:remove", log=True)
+    @authorize("admin:users:remove", log=True)
     def delete(self, user_id):
         # 删除用户
         res = _utils.delete_by_id(user_id)
@@ -76,7 +76,7 @@ class CURDUser(Resource):
             return fail_api(msg="删除失败")
         return success_api(msg="删除成功")
 
-    @authorize("admin:user:edit", log=True)
+    @authorize("admin:users:edit", log=True)
     def put(self, user_id):
 
         parser = reqparse.RequestParser()