From 7659065a6832776bfd2028f7ff1b5ad7466c78f1 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 29 May 2024 15:16:08 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20api=E4=BD=8D=E7=BD=AE=E6=8C=AA=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-ui/src/api/system/dept.js | 60 --------------- nladmin-ui/src/api/system/grid.js | 33 --------- nladmin-ui/src/api/system/gridField.js | 50 ------------- nladmin-ui/src/api/system/menu.js | 73 ------------------- nladmin-ui/src/router/index.js | 2 +- nladmin-ui/src/views/generator/config.vue | 4 +- .../src/{api => views}/generator/genConfig.js | 0 .../src/{api => views}/generator/generator.js | 0 nladmin-ui/src/views/generator/index.vue | 2 +- nladmin-ui/src/views/generator/preview.vue | 2 +- nladmin-ui/src/views/monitor/log/errorLog.vue | 2 +- nladmin-ui/src/views/monitor/log/index.vue | 2 +- .../{api/monitor => views/monitor/log}/log.js | 0 nladmin-ui/src/views/monitor/online/index.vue | 2 +- .../monitor/online}/online.js | 0 .../system => views/system/auto}/autorun.js | 0 nladmin-ui/src/views/system/auto/index.vue | 2 +- nladmin-ui/src/views/system/dept/index.vue | 2 +- .../logicflow/editor/components/Diagram.vue | 2 +- .../editor/components/DiagramToolbar.vue | 2 +- .../editor/components/PropertyPanel.vue | 2 +- .../views/system/logicflow/image/index.vue | 2 +- .../src/views/system/logicflow/index.vue | 2 +- .../{api => views/system}/logicflow/stage.js | 0 .../system}/logicflow/stageImage.js | 0 nladmin-ui/src/views/system/menu/dd/index.vue | 2 +- .../src/views/system/monitor/device/index.vue | 2 +- nladmin-ui/src/views/system/redis/index.vue | 2 +- .../system => views/system/redis}/redis.js | 0 nladmin-ui/src/views/system/role/index.vue | 4 +- .../system/user/center}/code.js | 0 .../views/system/user/center/updateEmail.vue | 2 +- .../user/dialog/relevanceDeptDialog.vue | 2 +- nladmin-ui/src/views/system/user/index.vue | 2 +- 34 files changed, 23 insertions(+), 239 deletions(-) delete mode 100644 nladmin-ui/src/api/system/dept.js delete mode 100644 nladmin-ui/src/api/system/grid.js delete mode 100644 nladmin-ui/src/api/system/gridField.js delete mode 100644 nladmin-ui/src/api/system/menu.js rename nladmin-ui/src/{api => views}/generator/genConfig.js (100%) rename nladmin-ui/src/{api => views}/generator/generator.js (100%) rename nladmin-ui/src/{api/monitor => views/monitor/log}/log.js (100%) rename nladmin-ui/src/{api/monitor => views/monitor/online}/online.js (100%) rename nladmin-ui/src/{api/system => views/system/auto}/autorun.js (100%) rename nladmin-ui/src/{api => views/system}/logicflow/stage.js (100%) rename nladmin-ui/src/{api => views/system}/logicflow/stageImage.js (100%) rename nladmin-ui/src/{api/system => views/system/redis}/redis.js (100%) rename nladmin-ui/src/{api/system => views/system/user/center}/code.js (100%) diff --git a/nladmin-ui/src/api/system/dept.js b/nladmin-ui/src/api/system/dept.js deleted file mode 100644 index 145887a..0000000 --- a/nladmin-ui/src/api/system/dept.js +++ /dev/null @@ -1,60 +0,0 @@ -import request from '@/utils/request' - -export function getDepts(params) { - return request({ - url: 'api/dept', - method: 'get', - params - }) -} - -export function getDeptTree(params) { - return request({ - url: '/api/dept/allTree', - method: 'get', - params - }) -} - -export function getDeptSuperior(ids) { - const data = ids.length || ids.length === 0 ? ids : Array.of(ids) - return request({ - url: 'api/dept/superior', - method: 'post', - data - }) -} - -export function getDeptvo(params) { - return request({ - url: 'api/dept/vo', - method: 'get', - params - }) -} - -export function add(data) { - return request({ - url: 'api/dept', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/dept', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/dept', - method: 'put', - data - }) -} - -export default { add, edit, del, getDepts, getDeptSuperior, getDeptvo, getDeptTree } diff --git a/nladmin-ui/src/api/system/grid.js b/nladmin-ui/src/api/system/grid.js deleted file mode 100644 index 02857d4..0000000 --- a/nladmin-ui/src/api/system/grid.js +++ /dev/null @@ -1,33 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/grid', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/grid/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/grid', - method: 'put', - data - }) -} -export function selectList() { - return request({ - url: 'api/grid/selectList', - method: 'get' - }) -} - -export default { add, edit, del, selectList } diff --git a/nladmin-ui/src/api/system/gridField.js b/nladmin-ui/src/api/system/gridField.js deleted file mode 100644 index a207188..0000000 --- a/nladmin-ui/src/api/system/gridField.js +++ /dev/null @@ -1,50 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/gridField', - method: 'post', - data - }) -} -export function batchAdd(json) { // use - return request({ - url: 'api/gridField/batchAdd', - method: 'post', - data: json - }) -} - -export function del(ids) { - return request({ - url: 'api/gridField/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/gridField', - method: 'put', - data - }) -} - -export function getGridFieldsById(id) { // use - return request({ - url: 'api/gridField/getGridFields', - method: 'post', - data: id - }) -} - -export function getGridFieldsByCode(grid_code) { // use - return request({ - url: 'api/gridField/getGridFieldsByCode', - method: 'post', - data: grid_code - }) -} - -export default { add, edit, del, batchAdd, getGridFieldsById, getGridFieldsByCode } diff --git a/nladmin-ui/src/api/system/menu.js b/nladmin-ui/src/api/system/menu.js deleted file mode 100644 index 7050f81..0000000 --- a/nladmin-ui/src/api/system/menu.js +++ /dev/null @@ -1,73 +0,0 @@ -import request from '@/utils/request' - -export function getMenusTree(pid) { - return request({ - url: 'api/sysMenu/lazy?pid=' + pid, - method: 'get' - }) -} - -export function getMenus(params) { - return request({ - url: 'api/sysMenu', - method: 'get', - params - }) -} - -export function getMenusByRole(params) { - return request({ - url: 'api/sysMenu/getMenusByRole', - method: 'post', - data: params - }) -} - -export function getMenuSuperior(ids) { - const data = ids.length || ids.length === 0 ? ids : Array.of(ids) - return request({ - url: 'api/sysMenu/superior', - method: 'post', - data - }) -} - -export function getChild(id) { - return request({ - url: 'api/sysMenu/child?id=' + id, - method: 'get' - }) -} - -export function buildMenus(data) { - return request({ - url: 'api/sysMenu/build?systemType=' + data, - method: 'get' - }) -} - -export function add(data) { - return request({ - url: 'api/sysMenu', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/sysMenu', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/sysMenu', - method: 'put', - data - }) -} - -export default { add, edit, del, getMenusTree, getMenuSuperior, getMenus, getChild, getMenusByRole } diff --git a/nladmin-ui/src/router/index.js b/nladmin-ui/src/router/index.js index 3b2226c..30be333 100644 --- a/nladmin-ui/src/router/index.js +++ b/nladmin-ui/src/router/index.js @@ -3,7 +3,7 @@ import store from '@/store' import NProgress from 'nprogress' // progress bar import 'nprogress/nprogress.css' // progress bar style import { getToken } from '@/utils/auth' // getToken from cookie -import { buildMenus } from '@/api/system/menu' +import { buildMenus } from '@/views/system/menu/menu' import { filterAsyncRouter } from '@/store/modules/permission' import i18n from '@/i18n' diff --git a/nladmin-ui/src/views/generator/config.vue b/nladmin-ui/src/views/generator/config.vue index 0ad0ed8..ec72ea4 100644 --- a/nladmin-ui/src/views/generator/config.vue +++ b/nladmin-ui/src/views/generator/config.vue @@ -202,8 +202,8 @@ <script> import crud from '@/mixins/crud' -import { update, get } from '@/api/generator/genConfig' -import { save, sync, generator } from '@/api/generator/generator' +import { update, get } from '@/views/generator/genConfig' +import { save, sync, generator } from '@/views/generator/generator' import { getDicts } from '@/views/system/dict/dict' export default { name: 'GeneratorConfig', diff --git a/nladmin-ui/src/api/generator/genConfig.js b/nladmin-ui/src/views/generator/genConfig.js similarity index 100% rename from nladmin-ui/src/api/generator/genConfig.js rename to nladmin-ui/src/views/generator/genConfig.js diff --git a/nladmin-ui/src/api/generator/generator.js b/nladmin-ui/src/views/generator/generator.js similarity index 100% rename from nladmin-ui/src/api/generator/generator.js rename to nladmin-ui/src/views/generator/generator.js diff --git a/nladmin-ui/src/views/generator/index.vue b/nladmin-ui/src/views/generator/index.vue index 6c192d4..b4df607 100644 --- a/nladmin-ui/src/views/generator/index.vue +++ b/nladmin-ui/src/views/generator/index.vue @@ -56,7 +56,7 @@ <script> -import { generator, sync } from '@/api/generator/generator' +import { generator, sync } from '@/views/generator/generator' import { downloadFile } from '@/utils/index' import CRUD, { presenter, header } from '@crud/crud' import rrOperation from '@crud/RR.operation' diff --git a/nladmin-ui/src/views/generator/preview.vue b/nladmin-ui/src/views/generator/preview.vue index d5b55f8..8d1777c 100644 --- a/nladmin-ui/src/views/generator/preview.vue +++ b/nladmin-ui/src/views/generator/preview.vue @@ -8,7 +8,7 @@ <script> import Java from '@/components/JavaEdit/index' -import { generator } from '@/api/generator/generator' +import { generator } from '@/views/generator/generator' export default { name: 'Preview', components: { Java }, diff --git a/nladmin-ui/src/views/monitor/log/errorLog.vue b/nladmin-ui/src/views/monitor/log/errorLog.vue index abbd67a..7749a3e 100644 --- a/nladmin-ui/src/views/monitor/log/errorLog.vue +++ b/nladmin-ui/src/views/monitor/log/errorLog.vue @@ -55,7 +55,7 @@ </template> <script> -import { getErrDetail, delAllError } from '@/api/monitor/log' +import { getErrDetail, delAllError } from '@/views/monitor/log/log' import Search from './search' import CRUD, { presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/views/monitor/log/index.vue b/nladmin-ui/src/views/monitor/log/index.vue index 387dbfd..6fcab06 100644 --- a/nladmin-ui/src/views/monitor/log/index.vue +++ b/nladmin-ui/src/views/monitor/log/index.vue @@ -55,7 +55,7 @@ <script> import Search from './search' -import { delAllInfo } from '@/api/monitor/log' +import { delAllInfo } from '@/views/monitor/log/log' import CRUD, { presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' diff --git a/nladmin-ui/src/api/monitor/log.js b/nladmin-ui/src/views/monitor/log/log.js similarity index 100% rename from nladmin-ui/src/api/monitor/log.js rename to nladmin-ui/src/views/monitor/log/log.js diff --git a/nladmin-ui/src/views/monitor/online/index.vue b/nladmin-ui/src/views/monitor/online/index.vue index 4b29f04..5b3b995 100644 --- a/nladmin-ui/src/views/monitor/online/index.vue +++ b/nladmin-ui/src/views/monitor/online/index.vue @@ -58,7 +58,7 @@ </template> <script> -import { del } from '@/api/monitor/online' +import { del } from '@/views/monitor/online/online' import CRUD, { presenter, header, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/api/monitor/online.js b/nladmin-ui/src/views/monitor/online/online.js similarity index 100% rename from nladmin-ui/src/api/monitor/online.js rename to nladmin-ui/src/views/monitor/online/online.js diff --git a/nladmin-ui/src/api/system/autorun.js b/nladmin-ui/src/views/system/auto/autorun.js similarity index 100% rename from nladmin-ui/src/api/system/autorun.js rename to nladmin-ui/src/views/system/auto/autorun.js diff --git a/nladmin-ui/src/views/system/auto/index.vue b/nladmin-ui/src/views/system/auto/index.vue index c0bd41c..cf2a5fe 100644 --- a/nladmin-ui/src/views/system/auto/index.vue +++ b/nladmin-ui/src/views/system/auto/index.vue @@ -44,7 +44,7 @@ </template> <script> -import crudAutoRun from '@/api/system/autorun' +import crudAutoRun from '@/views/system/auto/autorun' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/views/system/dept/index.vue b/nladmin-ui/src/views/system/dept/index.vue index 1493e36..0e0cfd7 100644 --- a/nladmin-ui/src/views/system/dept/index.vue +++ b/nladmin-ui/src/views/system/dept/index.vue @@ -134,7 +134,7 @@ </template> <script> -import crudDept from '@/api/system/dept' +import crudDept from '@/views/system/dept/dept' import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import CRUD, { crud, form, header, presenter } from '@crud/crud' diff --git a/nladmin-ui/src/views/system/logicflow/editor/components/Diagram.vue b/nladmin-ui/src/views/system/logicflow/editor/components/Diagram.vue index 81a0a02..90af015 100644 --- a/nladmin-ui/src/views/system/logicflow/editor/components/Diagram.vue +++ b/nladmin-ui/src/views/system/logicflow/editor/components/Diagram.vue @@ -52,7 +52,7 @@ import DiagramToolbar from './DiagramToolbar.vue' import DiagramSidebar from './DiagramSidebar.vue' import PropertyPanel from './PropertyPanel.vue' import { registerCustomElement } from './node' -import crudStage from '@/api/logicflow/stage' +import crudStage from '@/views/system/logicflow/stage' let data = '' let lf = '' diff --git a/nladmin-ui/src/views/system/logicflow/editor/components/DiagramToolbar.vue b/nladmin-ui/src/views/system/logicflow/editor/components/DiagramToolbar.vue index ac24070..c9f0792 100644 --- a/nladmin-ui/src/views/system/logicflow/editor/components/DiagramToolbar.vue +++ b/nladmin-ui/src/views/system/logicflow/editor/components/DiagramToolbar.vue @@ -89,7 +89,7 @@ import ZoomOut from './icon/ZoomOut.vue' import StepBack from './icon/StepBack.vue' import StepFoward from './icon/StepFoward.vue' import AreaSelect from './icon/AreaSelect.vue' -import crudStage from '@/api/logicflow/stage' +import crudStage from '@/views/system/logicflow/stage' export default { components: { diff --git a/nladmin-ui/src/views/system/logicflow/editor/components/PropertyPanel.vue b/nladmin-ui/src/views/system/logicflow/editor/components/PropertyPanel.vue index b59e078..4ed63d8 100644 --- a/nladmin-ui/src/views/system/logicflow/editor/components/PropertyPanel.vue +++ b/nladmin-ui/src/views/system/logicflow/editor/components/PropertyPanel.vue @@ -171,7 +171,7 @@ <script> import { Sketch } from 'vue-color' import { shortStyles, borderStyles, fontFamilies } from '../constant' -import crudStageImage from '@/api/logicflow/stageImage' +import crudStageImage from '@/views/system/logicflow/stageImage' export default { components: { diff --git a/nladmin-ui/src/views/system/logicflow/image/index.vue b/nladmin-ui/src/views/system/logicflow/image/index.vue index 81ad6ea..7712c52 100644 --- a/nladmin-ui/src/views/system/logicflow/image/index.vue +++ b/nladmin-ui/src/views/system/logicflow/image/index.vue @@ -109,7 +109,7 @@ </template> <script> -import crudStageImage from '@/api/logicflow/stageImage' +import crudStageImage from '@/views/system/logicflow/stageImage' import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/views/system/logicflow/index.vue b/nladmin-ui/src/views/system/logicflow/index.vue index 91d8455..f5769b0 100644 --- a/nladmin-ui/src/views/system/logicflow/index.vue +++ b/nladmin-ui/src/views/system/logicflow/index.vue @@ -62,7 +62,7 @@ </template> <script> -import crudStage from '@/api/logicflow/stage' +import crudStage from '@/views/system/logicflow/stage' import CRUD, { presenter, header, form, crud } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' diff --git a/nladmin-ui/src/api/logicflow/stage.js b/nladmin-ui/src/views/system/logicflow/stage.js similarity index 100% rename from nladmin-ui/src/api/logicflow/stage.js rename to nladmin-ui/src/views/system/logicflow/stage.js diff --git a/nladmin-ui/src/api/logicflow/stageImage.js b/nladmin-ui/src/views/system/logicflow/stageImage.js similarity index 100% rename from nladmin-ui/src/api/logicflow/stageImage.js rename to nladmin-ui/src/views/system/logicflow/stageImage.js diff --git a/nladmin-ui/src/views/system/menu/dd/index.vue b/nladmin-ui/src/views/system/menu/dd/index.vue index ba9e979..03ff604 100644 --- a/nladmin-ui/src/views/system/menu/dd/index.vue +++ b/nladmin-ui/src/views/system/menu/dd/index.vue @@ -176,7 +176,7 @@ </template> <script> -import crudMenu from '@/api/system/menu' +import crudMenu from '@/views/system/menu/menu' import IconSelect from '@/components/IconSelect' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' diff --git a/nladmin-ui/src/views/system/monitor/device/index.vue b/nladmin-ui/src/views/system/monitor/device/index.vue index 1367f72..969fef4 100644 --- a/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/nladmin-ui/src/views/system/monitor/device/index.vue @@ -7,7 +7,7 @@ </template> <script> -import crudStage from '@/api/logicflow/stage' +import crudStage from '@/views/system/logicflow/stage' import paramCrud from '@/views/system/param/param' import '@logicflow/core/dist/style/index.css' import '@logicflow/extension/lib/style/index.css' diff --git a/nladmin-ui/src/views/system/redis/index.vue b/nladmin-ui/src/views/system/redis/index.vue index 8a1b930..aefbb54 100644 --- a/nladmin-ui/src/views/system/redis/index.vue +++ b/nladmin-ui/src/views/system/redis/index.vue @@ -107,7 +107,7 @@ </template> <script> -import { getCache, getKeyDefineList, getKeyValueList, batch } from '@/api/system/redis' +import { getCache, getKeyDefineList, getKeyValueList, batch } from '@/views/system/redis/redis' import echarts from 'echarts' import i18n from '@/i18n' export default { diff --git a/nladmin-ui/src/api/system/redis.js b/nladmin-ui/src/views/system/redis/redis.js similarity index 100% rename from nladmin-ui/src/api/system/redis.js rename to nladmin-ui/src/views/system/redis/redis.js diff --git a/nladmin-ui/src/views/system/role/index.vue b/nladmin-ui/src/views/system/role/index.vue index 5c5589d..30dc6c8 100644 --- a/nladmin-ui/src/views/system/role/index.vue +++ b/nladmin-ui/src/views/system/role/index.vue @@ -122,8 +122,8 @@ <script> import crudRoles from './role' -import crudMenu from '@/api/system/menu' -import { getChild, getMenusTree } from '@/api/system/menu' +import crudMenu from '@/views/system/menu/menu' +import { getChild, getMenusTree } from '@/views/system/menu/menu' import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/api/system/code.js b/nladmin-ui/src/views/system/user/center/code.js similarity index 100% rename from nladmin-ui/src/api/system/code.js rename to nladmin-ui/src/views/system/user/center/code.js diff --git a/nladmin-ui/src/views/system/user/center/updateEmail.vue b/nladmin-ui/src/views/system/user/center/updateEmail.vue index aa98365..154f5e4 100644 --- a/nladmin-ui/src/views/system/user/center/updateEmail.vue +++ b/nladmin-ui/src/views/system/user/center/updateEmail.vue @@ -21,7 +21,7 @@ import store from '@/store' import { validEmail } from '@/utils/validate' import { updateEmail } from '@/views/system/user' -import { resetEmail } from '@/api/system/code' +import { resetEmail } from '@/views/system/user/center/code' export default { props: { email: { diff --git a/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue b/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue index 4f47cb0..0a4fc20 100644 --- a/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue +++ b/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue @@ -67,7 +67,7 @@ <script> -import crudDept from '@/api/system/dept' +import crudDept from '@/views/system/dept/dept' import CRUD, { header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue index 5c85812..cb40fb3 100644 --- a/nladmin-ui/src/views/system/user/index.vue +++ b/nladmin-ui/src/views/system/user/index.vue @@ -327,7 +327,7 @@ <script> import crudUser from '@/views/system/user/user' -import crudDept from '@/api/system/dept' +import crudDept from '@/views/system/dept/dept' import crudDataPermission from '@/views/system/dataPermission/dataPermission' import { getAll, getLevel } from '@/views/system/role/role' import CRUD, { crud, form, header, presenter } from '@crud/crud'