From 48b5c50f85497cac5db60e588420c11732681e4c Mon Sep 17 00:00:00 2001 From: "20932067@zju.edu.cn" Date: Mon, 25 Jan 2021 23:34:07 +0800 Subject: [PATCH] 11 --- hchyun-ui/.env.development | 1 + .../src/api/{system => tool}/apiclass.js | 14 +- hchyun-ui/src/api/{system => tool}/module.js | 14 +- hchyun-ui/src/router/index.js | 30 +- hchyun-ui/src/views/monitor/job/index.vue | 5 + hchyun-ui/src/views/monitor/job/log.vue | 5 +- .../src/views/monitor/logininfor/index.vue | 3 + hchyun-ui/src/views/monitor/operlog/index.vue | 3 + hchyun-ui/src/views/system/apiclass/index.vue | 329 -------------- hchyun-ui/src/views/system/config/index.vue | 13 +- hchyun-ui/src/views/system/dept/index.vue | 19 +- hchyun-ui/src/views/system/dict/data.vue | 8 +- hchyun-ui/src/views/system/dict/index.vue | 7 +- hchyun-ui/src/views/system/menu/index.vue | 17 +- hchyun-ui/src/views/system/notice/index.vue | 5 +- hchyun-ui/src/views/system/post/index.vue | 8 +- hchyun-ui/src/views/system/regular/index.vue | 4 + hchyun-ui/src/views/system/role/index.vue | 6 +- hchyun-ui/src/views/system/user/index.vue | 7 +- .../views/tool/apiclass/apiclassInfoForm.vue | 118 +++++ .../src/views/tool/apiclass/editTable.vue | 206 +++++++++ hchyun-ui/src/views/tool/apiclass/index.vue | 417 ++++++++++++++++++ .../src/views/tool/gen/basicInfoForm.vue | 60 +-- hchyun-ui/src/views/tool/module/editTable.vue | 201 +++++++++ .../views/{system => tool}/module/index.vue | 44 +- .../src/views/tool/module/moduleInfoForm.vue | 85 ++++ .../controller}/ApiclassController.java | 22 +- .../controller}/ModuleController.java | 24 +- .../hchyun/generator}/dao/ApiclassDao.java | 5 +- .../com/hchyun/generator}/dao/ModuleDao.java | 5 +- .../com/hchyun/generator/entity/Apiclass.java | 155 +++++++ .../com/hchyun/generator/entity/Module.java | 70 +++ .../generator}/service/ApiclassService.java | 4 +- .../generator}/service/ModuleService.java | 7 +- .../service/impl/ApiclassServiceImpl.java | 11 +- .../{ => impl}/GenTableColumnServiceImpl.java | 6 +- .../{ => impl}/GenTableServiceImpl.java | 3 +- .../service/impl/ModuleServiceImpl.java | 11 +- .../mapper/generator/ApiclassMapper.xml | 111 +++++ .../mapper/generator}/ModuleMapper.xml | 8 +- .../com/hchyun/system/entity/Apiclass.java | 90 ---- .../java/com/hchyun/system/entity/Module.java | 69 --- .../mapper/system/ApiclassMapper.xml | 77 ---- 43 files changed, 1609 insertions(+), 698 deletions(-) rename hchyun-ui/src/api/{system => tool}/apiclass.js (78%) rename hchyun-ui/src/api/{system => tool}/module.js (79%) delete mode 100644 hchyun-ui/src/views/system/apiclass/index.vue create mode 100644 hchyun-ui/src/views/tool/apiclass/apiclassInfoForm.vue create mode 100644 hchyun-ui/src/views/tool/apiclass/editTable.vue create mode 100644 hchyun-ui/src/views/tool/apiclass/index.vue create mode 100644 hchyun-ui/src/views/tool/module/editTable.vue rename hchyun-ui/src/views/{system => tool}/module/index.vue (86%) create mode 100644 hchyun-ui/src/views/tool/module/moduleInfoForm.vue rename hchyun/{hchyun-admin/src/main/java/com/hchyun/web/controller/system => hchyun-generator/src/main/java/com/hchyun/generator/controller}/ApiclassController.java (92%) rename hchyun/{hchyun-admin/src/main/java/com/hchyun/web/controller/system => hchyun-generator/src/main/java/com/hchyun/generator/controller}/ModuleController.java (90%) rename hchyun/{hchyun-system/src/main/java/com/hchyun/system => hchyun-generator/src/main/java/com/hchyun/generator}/dao/ApiclassDao.java (93%) rename hchyun/{hchyun-system/src/main/java/com/hchyun/system => hchyun-generator/src/main/java/com/hchyun/generator}/dao/ModuleDao.java (93%) create mode 100644 hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/Apiclass.java create mode 100644 hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/Module.java rename hchyun/{hchyun-system/src/main/java/com/hchyun/system => hchyun-generator/src/main/java/com/hchyun/generator}/service/ApiclassService.java (93%) rename hchyun/{hchyun-system/src/main/java/com/hchyun/system => hchyun-generator/src/main/java/com/hchyun/generator}/service/ModuleService.java (93%) rename hchyun/{hchyun-system/src/main/java/com/hchyun/system => hchyun-generator/src/main/java/com/hchyun/generator}/service/impl/ApiclassServiceImpl.java (94%) rename hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/{ => impl}/GenTableColumnServiceImpl.java (93%) rename hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/{ => impl}/GenTableServiceImpl.java (99%) rename hchyun/{hchyun-system/src/main/java/com/hchyun/system => hchyun-generator/src/main/java/com/hchyun/generator}/service/impl/ModuleServiceImpl.java (94%) create mode 100644 hchyun/hchyun-generator/src/main/resources/mapper/generator/ApiclassMapper.xml rename hchyun/{hchyun-system/src/main/resources/mapper/system => hchyun-generator/src/main/resources/mapper/generator}/ModuleMapper.xml (87%) delete mode 100644 hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/Apiclass.java delete mode 100644 hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/Module.java delete mode 100644 hchyun/hchyun-system/src/main/resources/mapper/system/ApiclassMapper.xml diff --git a/hchyun-ui/.env.development b/hchyun-ui/.env.development index a182f8c..3246ca5 100644 --- a/hchyun-ui/.env.development +++ b/hchyun-ui/.env.development @@ -4,6 +4,7 @@ ENV = 'development' # 宏驰云管理系统/开发环境 #VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = 'http://localhost:8085/dev-api' +#VUE_APP_BASE_API = 'http://apibase.hchyun.com/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/hchyun-ui/src/api/system/apiclass.js b/hchyun-ui/src/api/tool/apiclass.js similarity index 78% rename from hchyun-ui/src/api/system/apiclass.js rename to hchyun-ui/src/api/tool/apiclass.js index 5ebcb41..b5342b8 100644 --- a/hchyun-ui/src/api/system/apiclass.js +++ b/hchyun-ui/src/api/tool/apiclass.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询接口类名列表 export function listApiclass(query) { return request({ - url: '/system/apiclass/list', + url: '/tool/apiclass/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listApiclass(query) { // 获取模块管理选项列表 export function queryListApiclass() { return request({ - url: '/system/module/querylist', + url: '/tool/module/querylist', method: 'get', }) } @@ -20,7 +20,7 @@ export function queryListApiclass() { // 查询接口类名详细 export function getApiclass(id) { return request({ - url: '/system/apiclass/' + id, + url: '/tool/apiclass/' + id, method: 'get' }) } @@ -28,7 +28,7 @@ export function getApiclass(id) { // 新增接口类名 export function addApiclass(data) { return request({ - url: '/system/apiclass', + url: '/tool/apiclass', method: 'post', data: data }) @@ -37,7 +37,7 @@ export function addApiclass(data) { // 修改接口类名 export function updateApiclass(data) { return request({ - url: '/system/apiclass', + url: '/tool/apiclass', method: 'put', data: data }) @@ -46,7 +46,7 @@ export function updateApiclass(data) { // 删除接口类名 export function delApiclass(id) { return request({ - url: '/system/apiclass/' + id, + url: '/tool/apiclass/' + id, method: 'delete' }) } @@ -54,7 +54,7 @@ export function delApiclass(id) { // 导出接口类名 export function exportApiclass(query) { return request({ - url: '/system/apiclass/export', + url: '/tool/apiclass/export', method: 'get', params: query }) diff --git a/hchyun-ui/src/api/system/module.js b/hchyun-ui/src/api/tool/module.js similarity index 79% rename from hchyun-ui/src/api/system/module.js rename to hchyun-ui/src/api/tool/module.js index a6991f7..34648ce 100644 --- a/hchyun-ui/src/api/system/module.js +++ b/hchyun-ui/src/api/tool/module.js @@ -5,7 +5,7 @@ import request from '@/utils/request' // 查询模块管理列表 export function listModule(query) { return request({ - url: '/system/module/list', + url: '/tool/module/list', method: 'get', params: query }) @@ -14,7 +14,7 @@ export function listModule(query) { // 获取模块管理选项列表 export function queryListModule() { return request({ - url: '/system/module/querylist', + url: '/tool/module/querylist', method: 'get', }) } @@ -22,7 +22,7 @@ export function queryListModule() { // 查询模块管理详细 export function getModule(id) { return request({ - url: '/system/module/' + id, + url: '/tool/module/' + id, method: 'get' }) } @@ -30,7 +30,7 @@ export function getModule(id) { // 新增模块管理 export function addModule(data) { return request({ - url: '/system/module', + url: '/tool/module', method: 'post', data: data }) @@ -39,7 +39,7 @@ export function addModule(data) { // 修改模块管理 export function updateModule(data) { return request({ - url: '/system/module', + url: '/tool/module', method: 'put', data: data }) @@ -48,7 +48,7 @@ export function updateModule(data) { // 删除模块管理 export function delModule(id) { return request({ - url: '/system/module/' + id, + url: '/tool/module/' + id, method: 'delete' }) } @@ -56,7 +56,7 @@ export function delModule(id) { // 导出模块管理 export function exportModule(query) { return request({ - url: '/system/module/export', + url: '/tool/module/export', method: 'get', params: query }) diff --git a/hchyun-ui/src/router/index.js b/hchyun-ui/src/router/index.js index 2cca17c..1791440 100644 --- a/hchyun-ui/src/router/index.js +++ b/hchyun-ui/src/router/index.js @@ -92,6 +92,32 @@ export const constantRoutes = [ } ] }, + { + path: '/apiclass', + component: Layout, + hidden: true, + children: [ + { + path: 'edit/:apiclassId(\\d+)', + component: (resolve) => require(['@/views/tool/apiclass/editTable'], resolve), + name: 'ApiclassEdit', + meta: { title: '类生成配置' } + } + ] + }, + { + path: '/module', + component: Layout, + hidden: true, + children: [ + { + path: 'edit/:moduleId(\\d+)', + component: (resolve) => require(['@/views/tool/module/editTable'], resolve), + name: 'ModuleEdit', + meta: { title: '模块生成配置' } + } + ] + }, { path: '/job', component: Layout, @@ -114,10 +140,10 @@ export const constantRoutes = [ path: 'edit/:tableId(\\d+)', component: (resolve) => require(['@/views/tool/gen/editTable'], resolve), name: 'GenEdit', - meta: { title: '修改生成配置' } + meta: { title: '数据库生成配置' } } ] - } + }, ] export default new Router({ diff --git a/hchyun-ui/src/views/monitor/job/index.vue b/hchyun-ui/src/views/monitor/job/index.vue index 6760e78..01d7a7e 100644 --- a/hchyun-ui/src/views/monitor/job/index.vue +++ b/hchyun-ui/src/views/monitor/job/index.vue @@ -40,6 +40,7 @@ \ No newline at end of file + diff --git a/hchyun-ui/src/views/monitor/logininfor/index.vue b/hchyun-ui/src/views/monitor/logininfor/index.vue index c5eb4f5..ebf5aa7 100644 --- a/hchyun-ui/src/views/monitor/logininfor/index.vue +++ b/hchyun-ui/src/views/monitor/logininfor/index.vue @@ -59,6 +59,7 @@ -
- - - - - - - - - - - - - - - - - - - - - - 搜索 - 重置 - - - - - - 新增 - - - 修改 - - - 删除 - - - 导出 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - diff --git a/hchyun-ui/src/views/system/config/index.vue b/hchyun-ui/src/views/system/config/index.vue index 82e61d4..00c0fe9 100644 --- a/hchyun-ui/src/views/system/config/index.vue +++ b/hchyun-ui/src/views/system/config/index.vue @@ -53,6 +53,7 @@ @@ -353,4 +360,4 @@ export default { } } }; - \ No newline at end of file + diff --git a/hchyun-ui/src/views/system/dept/index.vue b/hchyun-ui/src/views/system/dept/index.vue index 93559af..c51a36f 100644 --- a/hchyun-ui/src/views/system/dept/index.vue +++ b/hchyun-ui/src/views/system/dept/index.vue @@ -31,6 +31,7 @@