Эх сурвалжийг харах

租户初始数据源测试

韩帛霖 1 жил өмнө
parent
commit
e3dadc2a16

+ 3 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.system;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -72,6 +74,7 @@ public class SysDictDataController extends BaseController
     /**
      * 根据字典类型查询字典数据信息
      */
+    @Anonymous
     @GetMapping(value = "/type/{dictType}")
     public AjaxResult dictType(@PathVariable String dictType)
     {

+ 11 - 0
ruoyi-ui/src/api/system/data.js

@@ -21,6 +21,7 @@ export function addSave(data) {
 }
 
 
+// 校验当前数据库名称得到得到当前数据源下所有库的信息
 export function getDataSourceInfo(query) {
   return request({
     url: '/dataSource/querySelectDataSource',
@@ -29,3 +30,13 @@ export function getDataSourceInfo(query) {
     baseURL:process.env.VUE_APP_BASE_API2
   })
 }
+// 校验当前数据库名称得到得到当前数据源下所有库的信息
+export function insertDataSource(data) {
+  return request({
+    url: '/tableInfo/initDatabase',
+    method: 'post',
+    data: data,
+    baseURL:process.env.VUE_APP_BASE_API2
+  })
+}
+

+ 16 - 1
ruoyi-ui/src/views/system/tenant/index.vue

@@ -51,6 +51,8 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
                    v-hasPermi="['system:tenant:export']">导出
         </el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleTest">test
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -161,7 +163,7 @@ import {
   updateTenant,
   bindDatasource,
 } from "@/api/system/tenant";
-import {getDataSourceInfo} from "@/api/system/data";
+import {getDataSourceInfo, insertDataSource} from "@/api/system/data";
 
 export default {
   name: "Tenant",
@@ -397,6 +399,19 @@ export default {
       getDataSourceInfo(qar).then(res => {
         console.log(res);
       })
+    },
+    handleTest() {
+      let formdata = {
+        databaseType: "mysql",
+        databaseName: "test1111",
+        databaseIp: "127.0.0.1",
+        username: "testname",
+        password: "123123",
+        portNumber: "3306"
+      }
+      insertDataSource(formdata).then(res => {
+        console.log(res);
+      })
     }
   },
 };