refactor(api):调整后端逻辑-下

2021-07-24 16:27:17 +08:00
parent b8e0173a9c
commit eb85e30b79
33 changed files with 788 additions and 779 deletions
@@ -67,6 +67,7 @@
    let form = layui.form
    let $ = layui.jquery
    let upload = layui.upload
+    
    let MODULE_PATH = '/api/v1/file/'

    let cols = [
@@ -84,12 +84,13 @@
    let $ = layui.jquery
    let layer = layui.layer
    let popup = layui.popup
+    let MODULE_PATH = '/api/v1/rights/'

    // 框架初始化时会读取 根目录下 pear.configs.yml 文件作为初始化配置
    // 你可以通过 admin.setConfigPath 方法修改配置文件位置
    // 你可以通过 admin.setConfigType 方法修改配置文件类型
    admin.setConfigType('json')
-    admin.setConfigPath("{{ url_for('rights.configs') }}")
+    admin.setConfigPath(MODULE_PATH + 'configs')

    admin.render()

@@ -26,7 +26,7 @@
    </div>
    <div class="layui-form-item">
        <input placeholder="验证码 : " name="captcha" hover class="code layui-input layui-input-inline"/>
-        <img src="{{ url_for('passport.get_captcha') }}" class="codeImage" id="captchaImage"/>
+        <img src="/passport/getCaptcha" class="codeImage" id="captchaImage"/>
    </div>
    <div class="layui-form-item">
        <input type="checkbox" name="remember-me" title="记住密码" lay-skin="primary">
@@ -45,13 +45,14 @@
    let layer = layui.layer
    let button = layui.button
    let popup = layui.popup
-    let captchaPath = "{{ url_for('passport.get_captcha') }}"
+    let captchaPath = "/passport/getCaptcha"

    form.on('submit(login)', function (data) {
      // data 是表单的数据
      let loader = layer.load()  // 加载按钮
      let btn = button.load({ elem: '.login' })
      $.ajax({
+        url: '/api/v1/passport/login',
        data: data.field,
        type: 'post',
        dataType: 'json',
@@ -61,7 +62,7 @@
          btn.stop(function () {
            if (result.success) {
              popup.success(result.msg, function () {
-                location.href = "{{ url_for('index.admin_index') }}"
+                location.href = "/admin"
              })
            } else {
              popup.failure(result.msg, function () {
@@ -102,10 +102,11 @@
    let $ = layui.jquery
    let iconPicker = layui.iconPicker
    let dtree = layui.dtree
+    let MODULE_PATH = '/api/v1/rights/'

    dtree.renderSelect({
      elem: '#selectParent',
-      url: '{{ url_for('rights.select_parent')}}',
+      url: MODULE_PATH + 'select_parent',
      method: 'get',
      selectInputName: { nodeId: 'parentId', context: 'powerName' },
      skin: 'layui',
@@ -142,7 +143,7 @@
      data.field.icon = 'layui-icon ' + data.field.icon
      console.log(data.field)
      $.ajax({
-        url: '/rights/power/' + data.field.powerId,
+        url: MODULE_PATH + 'power/' + data.field.powerId,
        data: JSON.stringify(data.field),
        dataType: 'json',
        contentType: 'application/json',
@@ -175,7 +175,7 @@
    let iconPicker = layui.iconPicker
    let dtree = layui.dtree

-    let MODULE_PATH = '/rights/'
+    let MODULE_PATH = '/api/v1/rights/'

    window.render = function () {
      treetable.render({
@@ -188,7 +188,7 @@
        treeDefaultClose: true,
        toolbar: '#power-toolbar',
        elem: '#power_table',
-        url: '{{ url_for('rights.data') }}',
+        url: MODULE_PATH + 'data',
        page: false,
        cols: [
          [
@@ -295,7 +295,7 @@
        title: '修改',
        shade: 0.1,
        area: ['450px', '500px'],
-        content: MODULE_PATH + 'power/' + obj.data['powerId']
+        content: '/rights/power/' + obj.data['powerId']
      })
    }
    window.remove = function (obj) {
@@ -367,7 +367,7 @@
    {#添加权限数据页面#}
    dtree.renderSelect({
      elem: '#select_parent_dept',
-      url: '{{ url_for('rights.select_parent') }}',
+      url: MODULE_PATH + 'select_parent',
      method: 'get',
      selectInputName: { nodeId: 'parentId', context: 'powerName' },
      skin: 'layui',
@@ -400,7 +400,7 @@
    form.on('submit(power-save)', function (data) {
      data.field.icon = 'layui-icon ' + data.field.icon
      $.ajax({
-        url: '/rights/power',
+        url: MODULE_PATH + 'power',
        data: JSON.stringify(data.field),
        dataType: 'json',
        contentType: 'application/json',
@@ -62,6 +62,8 @@
  layui.use(['form', 'jquery'], function () {
    let form = layui.form
    let $ = layui.jquery
+    let MODULE_PATH = '/api/v1/users/'
+
    form.on('submit(user-save)', function (data) {
      let roleIds = ''
      $('input[type=checkbox]:checked').each(function () {
@@ -71,7 +73,7 @@
      data.field.roleIds = roleIds

      $.ajax({
-        url: '/users/add',
+        url: MODULE_PATH + 'add',
        data: JSON.stringify(data.field),
        dataType: 'json',
        contentType: 'application/json',
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>修改密码</title>
-    {% include 'common/header.html' %}
-</head>
-<body>
-<form class="layui-form" action="">
-    <div class="mainBox">
-        <div class="main-container">
-            <div class="main-container">
-                <div class="layui-form-item">
-                    <label class="layui-form-label">旧密码</label>
-                    <div class="layui-input-block">
-                        <input type="password" name="oldPassword" lay-verify="title" autocomplete="off"
-                               placeholder="请输入标题" class="layui-input">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">新密码</label>
-                    <div class="layui-input-block">
-                        <input type="password" name="newPassword" lay-verify="title" autocomplete="off"
-                               placeholder="请输入标题" class="layui-input">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">确认密码</label>
-                    <div class="layui-input-block">
-                        <input type="password" name="confirmPassword" lay-verify="title" autocomplete="off"
-                               placeholder="请输入标题" class="layui-input">
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="bottom">
-        <div class="button-container">
-            <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit=""
-                    lay-filter="edit-password">
-                <i class="layui-icon layui-icon-ok"></i>
-                提交
-            </button>
-            <button type="reset" class="pear-btn pear-btn-sm">
-                <i class="layui-icon layui-icon-refresh"></i>
-                重置
-            </button>
-        </div>
-    </div>
-</form>
-{% include 'common/footer.html' %}
-<script>
-  layui.use(['form', 'jquery', 'popup'], function () {
-    let form = layui.form
-    let $ = layui.jquery
-    let popup = layui.popup
-
-    // 修改密码提交
-    form.on('submit(edit-password)', function (data) {
-      $.ajax({
-        url: '/users/editPassword',
-        data: JSON.stringify(data.field),
-        contentType: 'application/json',
-        dataType: 'json',
-        type: 'put',
-        success: function (result) {
-          if (result.success) {
-            popup.success(result.msg, function () {
-              parent.layer.close(parent.layer.getFrameIndex(window.name))
-            })
-          } else {
-            popup.failure(result.msg)
-          }
-        }
-      })
-      return false
-    })
-
-  })
-</script>
-</body>
-</html>
@@ -74,10 +74,11 @@
    let form = layui.form
    let $ = layui.jquery
    let dtree = layui.dtree
+    let MODULE_PATH = '/api/v1/users/'

    dtree.renderSelect({
      elem: '#selectParent',
-      url: '/dept/tree',
+      url: '/api/v1/dept/tree',
      method: 'get',
      selectInputName: { nodeId: 'deptId', context: 'deptName' },
      skin: 'layui',
@@ -93,7 +94,7 @@
      roleIds = roleIds.substr(0, roleIds.length - 1)
      data.field.roleIds = roleIds
      $.ajax({
-        url: '/users/' + data.field.userId,
+        url: MODULE_PATH + data.field.userId,
        data: JSON.stringify(data.field),
        dataType: 'json',
        contentType: 'application/json',
@@ -101,7 +102,7 @@
        success: function (result) {
          if (result.success) {
            layer.msg(result.msg, { icon: 1, time: 1000 }, function () {
-              parent.layer.close(parent.layer.getFrameIndex(window.name))//关闭当前页
+              parent.layer.close(parent.layer.getFrameIndex(window.name)) //关闭当前页
              parent.layui.table.reload('user-table')
            })
          } else {
@@ -111,7 +111,7 @@
    let dtree = layui.dtree
    let popup = layui.popup
    let common = layui.common
-    let MODULE_PATH = '/users/'
+    let MODULE_PATH = '/api/v1/users/'

    // 表格数据
    let cols = [
@@ -146,7 +146,7 @@
    dtree.render({
      elem: '#dept-tree',
      method: 'get',
-      url: '/dept/tree',
+      url: '/api/v1/dept/tree',
      dataFormat: 'list',
      line: true,
      skin: 'laySimple',
@@ -239,7 +239,7 @@
        title: '新增',
        shade: 0.1,
        area: ['550px', '550px'],
-        content: MODULE_PATH + 'add'
+        content: '/users/' + 'add'
      })
    }

@@ -249,7 +249,7 @@
        title: '修改',
        shade: 0.1,
        area: ['550px', '500px'],
-        content: MODULE_PATH + obj.data['id']
+        content: '/users/' + obj.data['id']
      })
    }

@@ -171,19 +171,66 @@
    </div>
 </div>
 {% include 'common/footer.html' %}
+</body>
+
+<form id="edit_password_view" class="layui-form" action="" style="display: none">
+    <div class="mainBox">
+        <div class="main-container">
+            <div class="main-container">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">旧密码</label>
+                    <div class="layui-input-block">
+                        <input type="password" name="oldPassword" lay-verify="title" autocomplete="off"
+                               placeholder="请输入标题" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">新密码</label>
+                    <div class="layui-input-block">
+                        <input type="password" name="newPassword" lay-verify="title" autocomplete="off"
+                               placeholder="请输入标题" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">确认密码</label>
+                    <div class="layui-input-block">
+                        <input type="password" name="confirmPassword" lay-verify="title" autocomplete="off"
+                               placeholder="请输入标题" class="layui-input">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="bottom">
+        <div class="button-container">
+            <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit=""
+                    lay-filter="edit-password">
+                <i class="layui-icon layui-icon-ok"></i>
+                提交
+            </button>
+            <button type="reset" class="pear-btn pear-btn-sm">
+                <i class="layui-icon layui-icon-refresh"></i>
+                重置
+            </button>
+        </div>
+    </div>
+</form>
 <script>
-  layui.use(['element', 'jquery', 'layer', 'form'], function () {
+  layui.use(['element', 'jquery', 'layer', 'form', 'popup'], function () {
    let $ = layui.jquery
    let layer = layui.layer
    let form = layui.form
+    let popup = layui.popup
+
+    let MODULE_PATH = '/api/v1/users/'
    // 修改密码页面
    $('.edit-password').click(function () {
      layer.open({
-        type: 2,
+        type: 1,
        title: '修改密码',
        shade: 0.1,
        area: ['550px', '280px'],
-        content: '/users/editPassword'
+        content: $('#edit_password_view')
      })
      return false
    })
@@ -206,7 +253,7 @@
    // 表单提交更改个人信息数据
    form.on('submit(user-update)', function (data) {
      $.ajax({
-        url: '/users/updateInfo',
+        url: MODULE_PATH + 'updateInfo',
        data: JSON.stringify(data.field),
        dataType: 'json',
        contentType: 'application/json',
@@ -221,7 +268,27 @@
      })
      return false
    })
+
+    // 修改密码提交
+    form.on('submit(edit-password)', function (data) {
+      $.ajax({
+        url: MODULE_PATH + 'editPassword',
+        data: JSON.stringify(data.field),
+        contentType: 'application/json',
+        dataType: 'json',
+        type: 'put',
+        success: function (result) {
+          if (result.success) {
+            popup.success(result.msg, function () {
+              parent.layer.close(parent.layer.getFrameIndex(window.name))
+            })
+          } else {
+            popup.failure(result.msg)
+          }
+        }
+      })
+      return false
+    })
  })
 </script>
-</body>
 </html>