将 tool 合并到 infra 模块

yudao-ui-admin/src/api/infra/codegen.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获得表定义分页
 export function getCodegenTablePage(query) {
   return request({
-    url: '/tool/codegen/table/page',
+    url: '/infra/codegen/table/page',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function getCodegenTablePage(query) {
 // 获得表和字段的明细
 export function getCodegenDetail(tableId) {
   return request({
-    url: '/tool/codegen/detail?tableId=' + tableId,
+    url: '/infra/codegen/detail?tableId=' + tableId,
     method: 'get',
   })
 }
@@ -20,7 +20,7 @@ export function getCodegenDetail(tableId) {
 // 修改代码生成信息
 export function updateCodegen(data) {
   return request({
-    url: '/tool/codegen/update',
+    url: '/infra/codegen/update',
     method: 'put',
     data: data
   })
@@ -29,7 +29,7 @@ export function updateCodegen(data) {
 // 基于数据库的表结构，同步数据库的表和字段定义
 export function syncCodegenFromDB(tableId) {
   return request({
-    url: '/tool/codegen/sync-from-db?tableId=' + tableId,
+    url: '/infra/codegen/sync-from-db?tableId=' + tableId,
     method: 'put'
   })
 }
@@ -37,7 +37,7 @@ export function syncCodegenFromDB(tableId) {
 // 基于 SQL 建表语句，同步数据库的表和字段定义
 export function syncCodegenFromSQL(tableId, sql) {
   return request({
-    url: '/tool/codegen/sync-from-sql?tableId=' + tableId,
+    url: '/infra/codegen/sync-from-sql?tableId=' + tableId,
     method: 'put',
     headers:{
       'Content-type': 'application/x-www-form-urlencoded'
@@ -49,7 +49,7 @@ export function syncCodegenFromSQL(tableId, sql) {
 // 预览生成代码
 export function previewCodegen(tableId) {
   return request({
-    url: '/tool/codegen/preview?tableId=' + tableId,
+    url: '/infra/codegen/preview?tableId=' + tableId,
     method: 'get',
   })
 }
@@ -57,7 +57,7 @@ export function previewCodegen(tableId) {
 // 下载生成代码
 export function downloadCodegen(tableId) {
   return request({
-    url: '/tool/codegen/download?tableId=' + tableId,
+    url: '/infra/codegen/download?tableId=' + tableId,
     method: 'get',
     responseType: 'blob'
   })
@@ -66,7 +66,7 @@ export function downloadCodegen(tableId) {
 // 获得表定义分页
 export function getSchemaTableList(query) {
   return request({
-    url: '/tool/codegen/db/table/list',
+    url: '/infra/codegen/db/table/list',
     method: 'get',
     params: query
   })
@@ -75,7 +75,7 @@ export function getSchemaTableList(query) {
 // 基于数据库的表结构，创建代码生成器的表定义
 export function createCodegenListFromDB(tableNames) {
   return request({
-    url: '/tool/codegen/create-list-from-db',
+    url: '/infra/codegen/create-list-from-db',
     method: 'post',
     headers:{
       'Content-type': 'application/x-www-form-urlencoded'
@@ -87,7 +87,7 @@ export function createCodegenListFromDB(tableNames) {
 // 基于 SQL 建表语句，创建代码生成器的表定义
 export function createCodegenListFromSQL(data) {
   return request({
-    url: '/tool/codegen/create-list-from-sql',
+    url: '/infra/codegen/create-list-from-sql',
     method: 'post',
     headers:{
       'Content-type': 'application/x-www-form-urlencoded'
@@ -99,7 +99,7 @@ export function createCodegenListFromSQL(data) {
 // 删除数据库的表和字段定义
 export function deleteCodegen(tableId) {
   return request({
-    url: '/tool/codegen/delete?tableId=' + tableId,
+    url: '/infra/codegen/delete?tableId=' + tableId,
     method: 'delete'
   })
 }

yudao-ui-admin/src/api/infra/dbDoc.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 
 export function exportHtml() {
   return request({
-    url: '/tool/db-doc/export-html',
+    url: '/infra/db-doc/export-html',
     method: 'get',
     responseType: 'blob'
   })
@@ -11,7 +11,7 @@ export function exportHtml() {
 
 export function exportWord() {
   return request({
-    url: '/tool/db-doc/export-word',
+    url: '/infra/db-doc/export-word',
     method: 'get',
     responseType: 'blob'
   })
@@ -19,7 +19,7 @@ export function exportWord() {
 
 export function exportMarkdown() {
   return request({
-    url: '/tool/db-doc/export-markdown',
+    url: '/infra/db-doc/export-markdown',
     method: 'get',
     responseType: 'blob'
   })

yudao-ui-admin/src/api/infra/testDemo.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建字典类型
 export function createTestDemo(data) {
   return request({
-    url: '/tool/test-demo/create',
+    url: '/infra/test-demo/create',
     method: 'post',
     data: data
   })
@@ -12,7 +12,7 @@ export function createTestDemo(data) {
 // 更新字典类型
 export function updateTestDemo(data) {
   return request({
-    url: '/tool/test-demo/update',
+    url: '/infra/test-demo/update',
     method: 'put',
     data: data
   })
@@ -21,7 +21,7 @@ export function updateTestDemo(data) {
 // 删除字典类型
 export function deleteTestDemo(id) {
   return request({
-    url: '/tool/test-demo/delete?id=' + id,
+    url: '/infra/test-demo/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -29,7 +29,7 @@ export function deleteTestDemo(id) {
 // 获得字典类型
 export function getTestDemo(id) {
   return request({
-    url: '/tool/test-demo/get?id=' + id,
+    url: '/infra/test-demo/get?id=' + id,
     method: 'get'
   })
 }
@@ -37,7 +37,7 @@ export function getTestDemo(id) {
 // 获得字典类型分页
 export function getTestDemoPage(query) {
   return request({
-    url: '/tool/test-demo/page',
+    url: '/infra/test-demo/page',
     method: 'get',
     params: query
   })
@@ -46,7 +46,7 @@ export function getTestDemoPage(query) {
 // 导出字典类型 Excel
 export function exportTestDemoExcel(query) {
   return request({
-    url: '/tool/test-demo/export-excel',
+    url: '/infra/test-demo/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

yudao-ui-admin/src/router/index.js

@@ -108,9 +108,9 @@ export const constantRoutes = [
     hidden: true,
     children: [{
         path: 'edit/:tableId(\\d+)',
-        component: (resolve) => require(['@/views/tool/codegen/editTable'], resolve),
+        component: (resolve) => require(['@/views/infra/codegen/editTable'], resolve),
         name: 'GenEdit',
-        meta: {title: '修改生成配置', activeMenu: '/tool/codegen'}
+        meta: {title: '修改生成配置', activeMenu: '/infra/codegen'}
       }
     ]
   }, {

yudao-ui-admin/src/utils/constants.js

@@ -43,7 +43,7 @@ export const SystemDataScopeEnum = {
 /**
  * 代码生成模板类型
  */
-export const ToolCodegenTemplateTypeEnum = {
+export const InfraCodegenTemplateTypeEnum = {
   CRUD: 1, // 基础 CRUD
   TREE: 2, // 树形 CRUD
   SUB: 3, // 主子表 CRUD

yudao-ui-admin/src/utils/dict.js

@@ -30,10 +30,8 @@ export const DICT_TYPE = {
   INFRA_JOB_LOG_STATUS: 'infra_job_log_status',
   INFRA_API_ERROR_LOG_PROCESS_STATUS: 'infra_api_error_log_process_status',
   INFRA_CONFIG_TYPE: 'infra_config_type',
-
-  // ========== TOOL 模块 ==========
-  TOOL_CODEGEN_TEMPLATE_TYPE: 'tool_codegen_template_type',
-  TOOL_CODEGEN_SCENE: 'tool_codegen_scene',
+  INFRA_CODEGEN_TEMPLATE_TYPE: 'infra_codegen_template_type',
+  INFRA_CODEGEN_SCENE: 'infra_codegen_scene',
 
   // ========== BPM 模块 ==========
   BPM_MODEL_CATEGORY: 'bpm_model_category',

yudao-ui-admin/src/views/bpm/form/formEditor.vue

@@ -145,9 +145,9 @@ import { debounce } from 'throttle-debounce'
 import { saveAs } from 'file-saver'
 import ClipboardJS from 'clipboard'
 import render from '@/components/render/render'
-import FormDrawer from '@/views/tool/build/FormDrawer'
-import JsonDrawer from '@/views/tool/build/JsonDrawer'
-import RightPanel from '@/views/tool/build/RightPanel'
+import FormDrawer from '@/views/infra/build/FormDrawer'
+import JsonDrawer from '@/views/infra/build/JsonDrawer'
+import RightPanel from '@/views/infra/build/RightPanel'
 import {
   inputComponents, selectComponents, layoutComponents, formConf
 } from '@/components/generator/config'
@@ -161,8 +161,8 @@ import { makeUpJs } from '@/components/generator/js'
 import { makeUpCss } from '@/components/generator/css'
 import drawingDefalut from '@/components/generator/drawingDefalut'
 import logo from '@/assets/logo/logo.png'
-import CodeTypeDialog from '@/views/tool/build/CodeTypeDialog'
-import DraggableItem from '@/views/tool/build/DraggableItem'
+import CodeTypeDialog from '@/views/infra/build/CodeTypeDialog'
+import DraggableItem from '@/views/infra/build/DraggableItem'
 import {
   getDrawingList, saveDrawingList, getIdGlobal, saveIdGlobal, getFormConf
 } from '@/utils/db'

yudao-ui-admin/src/views/infra/codegen/editTable.vue

@@ -127,7 +127,7 @@
   </el-card>
 </template>
 <script>
-import { getCodegenDetail, updateCodegen } from "@/api/tool/codegen";
+import { getCodegenDetail, updateCodegen } from "@/api/infra/codegen";
 import { listAllSimple as listAllSimpleDictType } from "@/api/system/dict/type";
 import { listSimpleMenus } from "@/api/system/menu";
 import basicInfoForm from "./basicInfoForm";
@@ -213,7 +213,7 @@ export default {
     /** 关闭按钮 */
     close() {
       this.$tab.closeOpenPage({
-        path: "/tool/codegen",
+        path: "/infra/codegen",
         query: { t: Date.now(), pageNum: this.$route.query.pageNum } }
       );
     }

yudao-ui-admin/src/views/infra/codegen/genInfoForm.vue

@@ -5,7 +5,7 @@
         <el-form-item prop="templateType">
           <span slot="label">生成模板</span>
           <el-select v-model="info.templateType" @change="tplSelectChange">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TOOL_CODEGEN_TEMPLATE_TYPE)"
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_CODEGEN_TEMPLATE_TYPE)"
                 :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
           </el-select>
         </el-form-item>
@@ -14,7 +14,7 @@
         <el-form-item prop="scene">
           <span slot="label">生成场景</span>
           <el-select v-model="info.scene">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TOOL_CODEGEN_SCENE)"
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_CODEGEN_SCENE)"
                        :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
           </el-select>
         </el-form-item>

yudao-ui-admin/src/views/infra/codegen/importTable.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import { getSchemaTableList, createCodegenListFromDB } from "@/api/tool/codegen";
+import { getSchemaTableList, createCodegenListFromDB } from "@/api/infra/codegen";
 export default {
   data() {
     return {

yudao-ui-admin/src/views/infra/codegen/index.vue

@@ -24,9 +24,9 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-upload" size="mini" @click="openImportTable"
-                   v-hasPermi="['tool:codegen:create']">基于 DB 导入</el-button>
+                   v-hasPermi="['infra:codegen:create']">基于 DB 导入</el-button>
         <el-button type="info" plain icon="el-icon-upload" size="mini" @click="openImportSQL"
-                   v-hasPermi="['tool:codegen:create']">基于 SQL 导入</el-button>
+                   v-hasPermi="['infra:codegen:create']">基于 SQL 导入</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -48,11 +48,11 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button type="text" size="small" icon="el-icon-view" @click="handlePreview(scope.row)" v-hasPermi="['tool:codegen:preview']">预览</el-button>
-          <el-button type="text" size="small" icon="el-icon-edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:codegen:update']">编辑</el-button>
-          <el-button type="text" size="small" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:codegen:delete']">删除</el-button>
-          <el-button type="text" size="small" icon="el-icon-refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:codegen:update']">同步</el-button>
-          <el-button type="text" size="small" icon="el-icon-download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:codegen:download']">生成代码</el-button>
+          <el-button type="text" size="small" icon="el-icon-view" @click="handlePreview(scope.row)" v-hasPermi="['infra:codegen:preview']">预览</el-button>
+          <el-button type="text" size="small" icon="el-icon-edit" @click="handleEditTable(scope.row)" v-hasPermi="['infra:codegen:update']">编辑</el-button>
+          <el-button type="text" size="small" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['infra:codegen:delete']">删除</el-button>
+          <el-button type="text" size="small" icon="el-icon-refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['infra:codegen:update']">同步</el-button>
+          <el-button type="text" size="small" icon="el-icon-download" @click="handleGenTable(scope.row)" v-hasPermi="['infra:codegen:download']">生成代码</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -101,7 +101,7 @@
 
 <script>
 import { getCodegenTablePage, previewCodegen, downloadCodegen, deleteCodegen,
-  syncCodegenFromDB, syncCodegenFromSQL, createCodegenListFromSQL } from "@/api/tool/codegen";
+  syncCodegenFromDB, syncCodegenFromSQL, createCodegenListFromSQL } from "@/api/infra/codegen";
 
 import importTable from "./importTable";
 // 代码高亮插件

yudao-ui-admin/src/views/infra/dbDoc/index.vue

@@ -15,7 +15,7 @@
   </div>
 </template>
 <script>
-import { exportHtml, exportWord, exportMarkdown} from "@/api/tool/dbDoc";
+import { exportHtml, exportWord, exportMarkdown} from "@/api/infra/dbDoc";
 import iFrame from "@/components/iFrame/index";
 
 export default {

yudao-ui-admin/src/views/infra/testDemo/index.vue

@@ -36,11 +36,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['tool:test-demo:create']">新增</el-button>
+                   v-hasPermi="['infra:test-demo:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['tool:test-demo:export']">导出</el-button>
+                   v-hasPermi="['infra:test-demo:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -61,9 +61,9 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['tool:test-demo:update']">修改</el-button>
+                     v-hasPermi="['infra:test-demo:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['tool:test-demo:delete']">删除</el-button>
+                     v-hasPermi="['infra:test-demo:delete']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -103,7 +103,7 @@
 </template>
 
 <script>
-import { createTestDemo, updateTestDemo, deleteTestDemo, getTestDemo, getTestDemoPage, exportTestDemoExcel } from "@/api/tool/testDemo";
+import { createTestDemo, updateTestDemo, deleteTestDemo, getTestDemo, getTestDemoPage, exportTestDemoExcel } from "@/api/infra/testDemo";
 
 export default {
   name: "TestDemo",