feat: 完善接口

src/api/modules/index.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 // sysAppFun APP功能
 module.exports.sysAppFun = require('./sys_app_fun')
 // sysArea 区域
@@ -10,6 +9,8 @@ module.exports.sysAttachment = require('./sys_attachment')
 module.exports.sysCas = require('./sys_cas')
 // sysClient 客户端
 module.exports.sysClient = require('./sys_client')
+// sysComment 评论
+module.exports.sysComment = require('./sys_comment')
 // sysDataPermission 数据权限
 module.exports.sysDataPermission = require('./sys_data_permission')
 // sysDingtalk 钉钉
@@ -18,6 +19,8 @@ module.exports.sysDingtalk = require('./sys_dingtalk')
 module.exports.sysDomain = require('./sys_domain')
 // sysMenu 菜单
 module.exports.sysMenu = require('./sys_menu')
+// sysNotification 站内消息
+module.exports.sysNotification = require('./sys_notification')
 // sysOptionset 字典
 module.exports.sysOptionset = require('./sys_optionset')
 // sysOrg 组织
@@ -28,6 +31,8 @@ module.exports.sysPermission = require('./sys_permission')
 module.exports.sysRole = require('./sys_role')
 // sysScheduling 调度
 module.exports.sysScheduling = require('./sys_scheduling')
+// sysSetting 设置
+module.exports.sysSetting = require('./sys_setting')
 // sysTag 标签
 module.exports.sysTag = require('./sys_tag')
 // sysTagGroup 标签组
@@ -38,5 +43,9 @@ module.exports.sysTracker = require('./sys_tracker')
 module.exports.sysUser = require('./sys_user')
 // sysUserTemplate 用户模板
 module.exports.sysUserTemplate = require('./sys_user_template')
+// sysUserTemplateDetail 用户模板详情
+module.exports.sysUserTemplateDetail = require('./sys_user_template_detail')
 // sysWechat 微信
 module.exports.sysWechat = require('./sys_wechat')
+// sysWorker worker
+module.exports.sysWorker = require('./sys_worker')

src/api/modules/sys_app_fun.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加APP功能
@@ -67,4 +66,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_area.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加区域
@@ -55,4 +54,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_attachment.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加附件
@@ -30,8 +29,7 @@ module.exports.export = (data) => {
   }
   return axios({
     url: url,
-    method: 'get',
-    responseType: 'blob'
+    method: 'get'
   })
 }
 
@@ -78,4 +76,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_cas.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // login 用户认证
@@ -127,4 +126,3 @@ module.exports.qrcode = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_client.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加客户端
@@ -55,4 +54,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_comment.js

@@ -0,0 +1,56 @@
+// Code generated by dol build. DO NOT EDIT.
+const axios = require('@/utils/request').default
+
+// add 添加评论
+module.exports.add = (data) => {
+  const url = '/api/sys/comment/add'
+  return axios({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+
+// del 删除评论
+module.exports.del = (data) => {
+  const url = '/api/sys/comment/del'
+  return axios({
+    url: url,
+    method: 'delete',
+    data
+  })
+}
+
+// update 更新评论
+module.exports.update = (data) => {
+  const url = '/api/sys/comment/update'
+  return axios({
+    url: url,
+    method: 'put',
+    data
+  })
+}
+
+// page 评论分页查询
+module.exports.page = (data) => {
+  let url = '/api/sys/comment/page?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}
+
+// get 获取评论信息
+module.exports.get = (data) => {
+  let url = '/api/sys/comment/get?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}

src/api/modules/sys_data_permission.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加数据权限
@@ -55,4 +54,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_dingtalk.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // oauth2 授权回调
@@ -13,4 +12,3 @@ module.exports.oauth2 = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_domain.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加域
@@ -55,4 +54,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_menu.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加菜单
@@ -89,4 +88,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_notification.js

@@ -0,0 +1,56 @@
+// Code generated by dol build. DO NOT EDIT.
+const axios = require('@/utils/request').default
+
+// add 添加站内消息
+module.exports.add = (data) => {
+  const url = '/api/sys/notification/add'
+  return axios({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+
+// del 删除站内消息
+module.exports.del = (data) => {
+  const url = '/api/sys/notification/del'
+  return axios({
+    url: url,
+    method: 'delete',
+    data
+  })
+}
+
+// update 更新站内消息
+module.exports.update = (data) => {
+  const url = '/api/sys/notification/update'
+  return axios({
+    url: url,
+    method: 'put',
+    data
+  })
+}
+
+// page 站内消息分页查询
+module.exports.page = (data) => {
+  let url = '/api/sys/notification/page?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}
+
+// get 获取站内消息信息
+module.exports.get = (data) => {
+  let url = '/api/sys/notification/get?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}

src/api/modules/sys_optionset.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加字典
@@ -55,4 +54,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_org.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加组织
@@ -77,4 +76,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_permission.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加权限
@@ -55,4 +54,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_role.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加角色
@@ -79,4 +78,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_scheduling.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加调度
@@ -55,4 +54,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_setting.js

@@ -0,0 +1,56 @@
+// Code generated by dol build. DO NOT EDIT.
+const axios = require('@/utils/request').default
+
+// add 添加设置
+module.exports.add = (data) => {
+  const url = '/api/sys/setting/add'
+  return axios({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+
+// del 删除设置
+module.exports.del = (data) => {
+  const url = '/api/sys/setting/del'
+  return axios({
+    url: url,
+    method: 'delete',
+    data
+  })
+}
+
+// update 更新设置
+module.exports.update = (data) => {
+  const url = '/api/sys/setting/update'
+  return axios({
+    url: url,
+    method: 'put',
+    data
+  })
+}
+
+// page 设置分页查询
+module.exports.page = (data) => {
+  let url = '/api/sys/setting/page?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}
+
+// get 获取设置信息
+module.exports.get = (data) => {
+  let url = '/api/sys/setting/get?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}

src/api/modules/sys_tag.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加标签
@@ -55,4 +54,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_tag_group.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加标签组
@@ -55,4 +54,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_tracker.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // page 日志分页查询
@@ -25,4 +24,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_user.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加用户
@@ -77,4 +76,3 @@ module.exports.logout = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_user_template.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // add 添加用户模板
@@ -55,4 +54,3 @@ module.exports.get = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_user_template_detail.js

@@ -0,0 +1,56 @@
+// Code generated by dol build. DO NOT EDIT.
+const axios = require('@/utils/request').default
+
+// add 添加用户模板详情
+module.exports.add = (data) => {
+  const url = '/api/sys/user/template/detail/add'
+  return axios({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+
+// del 删除用户模板详情
+module.exports.del = (data) => {
+  const url = '/api/sys/user/template/detail/del'
+  return axios({
+    url: url,
+    method: 'delete',
+    data
+  })
+}
+
+// update 更新用户模板详情
+module.exports.update = (data) => {
+  const url = '/api/sys/user/template/detail/update'
+  return axios({
+    url: url,
+    method: 'put',
+    data
+  })
+}
+
+// page 用户模板详情分页查询
+module.exports.page = (data) => {
+  let url = '/api/sys/user/template/detail/page?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}
+
+// get 获取用户模板详情信息
+module.exports.get = (data) => {
+  let url = '/api/sys/user/template/detail/get?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}

src/api/modules/sys_wechat.js

@@ -1,5 +1,4 @@
 // Code generated by dol build. DO NOT EDIT.
-// source: auto.go
 const axios = require('@/utils/request').default
 
 // oauth2 授权回调
@@ -13,4 +12,3 @@ module.exports.oauth2 = (data) => {
     method: 'get'
   })
 }
-

src/api/modules/sys_worker.js

@@ -0,0 +1,24 @@
+// Code generated by dol build. DO NOT EDIT.
+const axios = require('@/utils/request').default
+
+// add 添加worker
+module.exports.add = (data) => {
+  const url = '/api/sys/worker/add'
+  return axios({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+
+// get 获取worker信息
+module.exports.get = (data) => {
+  let url = '/api/sys/worker/get?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}

src/components/Query/index.vue

@@ -92,9 +92,9 @@
         <el-button v-if="folding" :size="size" @click="show = !show">
           {{ show ? "折叠" : "展开" }}
         </el-button>
-        <el-button type="primary" :size="size" @click.prevent="onSubmit">{{ $t('common.search') }}</el-button>
-        <el-button :size="size" @click="resetForm()">{{ $t('common.reset') }}</el-button>
-        <el-button :loading="isExporting" type="primary" :size="size" @click="onExport">{{ $t('common.export') }}</el-button>
+        <el-button type="primary" :size="size" icon="el-icon-search" @click.prevent="onSubmit">{{ $t('common.search') }}</el-button>
+        <el-button :size="size" icon="el-icon-brush" @click="resetForm()">{{ $t('common.reset') }}</el-button>
+        <!-- <el-button :loading="isExporting" type="primary" :size="size" @click="onExport">{{ $t('common.export') }}</el-button> -->
       </el-col>
     </el-row>
     <transition name="el-zoom-in-top">

src/utils/request.js

@@ -50,13 +50,12 @@ service.interceptors.response.use(
     const { msg, code = 'Error' } = response.data
     if (code !== 200) {
       if (code === 403) {
-        return Message({
+        Message({
           message: 'Insufficient permissions, please contact your administrator',
           type: 'error',
           duration: 5 * 1000
-        }).then(() => {
-          return Promise.reject(new Error(msg))
         })
+        return Promise.reject(new Error(msg))
       } else if (code === 401) {
         return MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
           confirmButtonText: 'Re-Login',
@@ -68,13 +67,12 @@ service.interceptors.response.use(
           })
         })
       } else {
-        return Message({
+        Message({
           message: msg,
           type: 'error',
           duration: 5 * 1000
-        }).then(() => {
-          return Promise.reject(new Error(msg))
         })
+        return Promise.reject(new Error(msg))
       }
     }
     return response.data

src/views/user/index.vue

@@ -10,6 +10,18 @@
             <el-header height="82">
               <query ref="searchForm" :form-config="query" @onSubmit="search" />
             </el-header>
+            <el-header height="120">
+              <el-row :gutter="1" type="flex" justify="space-between" style="margin-bottom: 10px;">
+                <el-col :span="12">
+                  <b>用户列表</b>
+                </el-col>
+                <el-col :span="8" style="text-align: right;">
+                  <el-button type="primary" :size="size" icon="el-icon-plus" @click="create">添加</el-button>
+                  <el-button type="danger" :size="size" icon="el-icon-delete" @click="deleteBatch">批量删除</el-button>
+                  <el-button type="primary" :size="size" icon="el-icon-download" @click="create">导出</el-button>
+                </el-col>
+              </el-row>
+            </el-header>
             <el-main class="table-main">
               <sheet ref="qtable" :api="this.$api.sysUser.page" :columns="tableColumns" :data-query="dataQuery" :operates="operates" :float-type="'right'" :select-type="'selection'" header-name="searchForm" />
             </el-main>
@@ -45,6 +57,9 @@
             <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="Status:" prop="status">
+          <option-set :value.sync="temp.status" placeholder="Please input status" code="sys_user_status" />
+        </el-form-item>
         <el-form-item label="Template:" prop="temp_id">
           <el-select v-model="temp.temp_id" style="width: 100%" placeholder="Please select the template" @change="tempChange">
             <el-option v-for="item in templs" :key="item.id" :label="item.name" :value="item.id" />
@@ -86,6 +101,7 @@ import { mapGetters } from 'vuex'
 import { deepClone } from '@/utils/index'
 import checkPermission from '@/utils/permission'
 import Tree from '@/components/Tree'
+import OptionSet from '@/components/OptionSet'
 import Sheet from '@/components/Sheet'
 import Query from '@/components/Query'
 import { user } from './query'
@@ -96,7 +112,8 @@ export default {
   components: {
     Tree,
     Sheet,
-    Query
+    Query,
+    OptionSet
   },
   mixins: [user],
   data() {
@@ -131,6 +148,7 @@ export default {
       temp: {
         id: undefined,
         name: '',
+        status: 0,
         password: '',
         email: '',
         mobile: '',
@@ -202,7 +220,7 @@ export default {
       this.temp_items[dataIndex].value.push(obj)
     },
     getTempDetail(temp_id) {
-      this.$api.sysUserTemplate.page({ page: 1, size: 100, 'temp_id': temp_id }).then(res => {
+      this.$api.sysUserTemplateDetail.page({ page: 1, size: 100, 'temp_id': temp_id }).then(res => {
         this.temp_items = res.data.data
         var tempValue
         if (this.temp.temp_value !== '' && this.temp.temp_value !== undefined) {
@@ -234,7 +252,7 @@ export default {
     FindUserTempl() {
       this.$api.sysUserTemplate.page({ page: 1, size: 100 }).then(res => {
         if (res.code === 200) {
-          this.templs = res.data.content
+          this.templs = res.data.data
         }
       })
     },
@@ -261,7 +279,7 @@ export default {
       this.$refs['tempForm'].validate((valid) => {
         if (valid) {
           this.temp.temp_value = JSON.stringify(this.temp_items)
-          this.$api.sysUser.create(this.temp).then((res) => {
+          this.$api.sysUser.add(this.temp).then((res) => {
             if (res.code === 200) {
               this.$message({
                 message: '创建成功',