From 04c3cdf372fa5a473d777fc453b53e8400685843 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 7 Apr 2023 23:25:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20swagger=E3=80=81druid?=
 =?UTF-8?q?=E3=80=81skywalking=E3=80=81admin=20=E7=9A=84=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/config/ConfigController.java        |   2 +-
 yudao-ui-admin/src/api/infra/redis.js         |  45 ------
 .../src/views/infra/druid/index.vue           |  17 ++-
 .../src/views/infra/redis/index.vue           | 129 +-----------------
 .../src/views/infra/server/index.vue          |  16 ++-
 .../src/views/infra/skywalking/index.vue      |  16 ++-
 .../src/views/infra/swagger/index.vue         |  18 ++-
 7 files changed, 62 insertions(+), 181 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
index afaee6fa4..f9a6a8e9e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
@@ -73,7 +73,7 @@ public class ConfigController {
     public CommonResult<String> getConfigKey(@RequestParam("key") String key) {
         ConfigDO config = configService.getConfigByKey(key);
         if (config == null) {
-            return null;
+            return success(null);
         }
         if (!config.getVisible()) {
             throw exception(ErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_VISIBLE);
diff --git a/yudao-ui-admin/src/api/infra/redis.js b/yudao-ui-admin/src/api/infra/redis.js
index dadc221bf..fce187475 100644
--- a/yudao-ui-admin/src/api/infra/redis.js
+++ b/yudao-ui-admin/src/api/infra/redis.js
@@ -7,48 +7,3 @@ export function getCache() {
     method: 'get'
   })
 }
-
-// 获取模块
-export function getKeyDefineList() {
-  return request({
-    url: '/infra/redis/get-key-define-list',
-    method: 'get'
-  })
-}
-
-// 获取键名列表
-export function getKeyList(keyTemplate) {
-  return request({
-    url: '/infra/redis/get-key-list',
-    method: 'get',
-    params: {
-      keyTemplate
-    }
-  })
-}
-
-// 获取缓存内容
-export function getKeyValue(key) {
-  return request({
-    url: '/infra/redis/get-key-value?key=' + key,
-    method: 'get'
-  })
-}
-
-// 根据键名删除缓存
-export function deleteKey(key) {
-  return request({
-    url: '/infra/redis/delete-key?key=' + key,
-    method: 'delete'
-  })
-}
-
-export function deleteKeys(keyTemplate) {
-  return request({
-    url: '/infra/redis/delete-keys?',
-    method: 'delete',
-    params: {
-      keyTemplate
-    }
-  })
-}
diff --git a/yudao-ui-admin/src/views/infra/druid/index.vue b/yudao-ui-admin/src/views/infra/druid/index.vue
index 78751251a..88a70a5ba 100644
--- a/yudao-ui-admin/src/views/infra/druid/index.vue
+++ b/yudao-ui-admin/src/views/infra/druid/index.vue
@@ -2,18 +2,31 @@
   <div>
     <doc-alert title="数据库 MyBatis" url="https://doc.iocoder.cn/mybatis/" />
     <doc-alert title="多数据源（读写分离）" url="https://doc.iocoder.cn/dynamic-datasource/" />
-    <i-frame :src="url" />
+
+    <i-frame v-if="!loading" :src="url" />
   </div>
 </template>
 <script>
 import iFrame from "@/components/iFrame/index";
+import { getConfigKey } from "@/api/infra/config";
 export default {
   name: "Druid",
   components: { iFrame },
   data() {
     return {
-      url: process.env.VUE_APP_BASE_API + "/druid/index.html"
+      url: process.env.VUE_APP_BASE_API + "/druid/index.html",
+      loading: true
     };
   },
+  created() {
+    getConfigKey("url.druid").then(response => {
+      if (!response.data || response.data.length === 0) {
+        return
+      }
+      this.url = response.data;
+    }).finally(() => {
+      this.loading = false;
+    })
+  }
 };
 </script>
diff --git a/yudao-ui-admin/src/views/infra/redis/index.vue b/yudao-ui-admin/src/views/infra/redis/index.vue
index 63be640bc..38e1cf823 100644
--- a/yudao-ui-admin/src/views/infra/redis/index.vue
+++ b/yudao-ui-admin/src/views/infra/redis/index.vue
@@ -65,77 +65,11 @@
         </el-card>
       </el-col>
     </el-row>
-
-    <el-table v-loading="keyDefineListLoad" :data="keyDefineList" row-key="id" @row-click="openKeyTemplate">
-      <el-table-column prop="keyTemplate" label="Key 模板" width="200" />
-      <el-table-column prop="keyType" label="Key 类型" width="100" />
-      <el-table-column prop="valueType" label="Value 类型" />
-      <el-table-column prop="timeoutType" label="超时时间" width="200">
-        <template v-slot="scope">
-          <dict-tag
-            :type="DICT_TYPE.INFRA_REDIS_TIMEOUT_TYPE"
-            :value="scope.row.timeoutType"
-          />
-          <span v-if="scope.row.timeout > 0"
-            >({{ scope.row.timeout / 1000 }} 秒)</span
-          >
-        </template>
-      </el-table-column>
-      <el-table-column prop="memo" label="备注" />
-    </el-table>
-
-    <!-- 缓存模块信息框 -->
-    <el-dialog :title="keyTemplate + ' 模板'" :visible.sync="open" width="70vw" append-to-body>
-      <el-row :gutter="10">
-        <el-col :span="14" class="card-box">
-          <el-card style="height: 70vh; overflow: scroll">
-            <div slot="header">
-              <span>键名列表</span>
-              <el-button style="float: right; padding: 3px 0" type="text" icon="el-icon-refresh-right" @click="refreshKeys" />
-            </div>
-            <el-table :data="cacheKeys" style="width: 100%" @row-click="handleKeyValue">
-              <el-table-column label="缓存键名" align="center" :show-overflow-tooltip="true">
-                <template v-slot="scope">{{ scope.row }}</template>
-              </el-table-column>
-              <el-table-column label="操作" width="60" align="center" class-name="small-padding fixed-width">
-                <template v-slot="scope">
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteKey(scope.row)" />
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-card>
-        </el-col>
-
-        <el-col :span="10">
-          <el-card :bordered="false" style="height: 70vh">
-            <div slot="header">
-              <span>缓存内容</span>
-              <el-button style="float: right; padding: 3px 0" type="text" icon="el-icon-refresh-right"
-                         @click="handleDeleteKeys(keyTemplate)">清理全部</el-button>
-            </div>
-          <el-form :model="cacheForm">
-            <el-row :gutter="32">
-              <el-col :offset="1" :span="22">
-                <el-form-item label="缓存键名:" prop="key">
-                  <el-input v-model="cacheForm.key" :readOnly="true" />
-                </el-form-item>
-                </el-col>
-                <el-col :offset="1" :span="22">
-                  <el-form-item label="缓存内容:" prop="value">
-                    <el-input v-model="cacheForm.value" type="textarea" :rows="12" :readOnly="true"/>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-card>
-        </el-col>
-      </el-row>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import {getCache, getKeyDefineList, getKeyList, getKeyValue, deleteKey, deleteKeys} from "@/api/infra/redis";
+import { getCache } from "@/api/infra/redis";
 import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 export default {
@@ -147,15 +81,7 @@ export default {
       // 使用内存
       usedmemory: null,
       // cache 信息
-      cache: [],
-      // key 列表
-      keyDefineListLoad: true,
-      keyDefineList: [],
-      // 模块弹出框
-      open: false,
-      keyTemplate: "",
-      cacheKeys: [],
-      cacheForm: {}
+      cache: []
     };
   },
   created () {
@@ -220,61 +146,12 @@ export default {
           ],
         });
       });
-
-      // 查询 Redis Key 列表
-      getKeyDefineList().then(response => {
-        this.keyDefineList = response.data;
-        this.keyDefineListLoad = false;
-      });
     },
 
     // 打开加载层
     openLoading () {
       this.$modal.loading("正在加载缓存监控数据，请稍后！");
-    },
-
-    // 打开缓存弹窗
-    openKeyTemplate (keyDefine) {
-      this.open = true;
-      // 加载键名列表
-      this.keyTemplate = keyDefine.keyTemplate;
-      this.doGetKeyList(this.keyTemplate);
-    },
-
-    // 获取键名列表
-    doGetKeyList (keyTemplate) {
-      getKeyList(keyTemplate).then(response => {
-        this.cacheKeys = response.data
-        this.cacheForm = {}
-      })
-    },
-
-    // 获取缓存值
-    handleKeyValue (key) {
-      getKeyValue(key).then(response => {
-        this.cacheForm = response.data
-      })
-    },
-
-    // 刷新键名列表
-    refreshKeys() {
-      this.$modal.msgSuccess("刷新键名列表成功");
-      this.doGetKeyList(this.keyTemplate);
-    },
-
-    // 删除缓存
-    handleDeleteKey(key){
-      deleteKey(key).then(response => {
-        this.$modal.msgSuccess("清理缓存键名[" + key + "]成功");
-        this.doGetKeyList(this.keyTemplate);
-      })
-    },
-    handleDeleteKeys(keyTemplate){
-      deleteKeys(keyTemplate).then(response => {
-        this.$modal.msgSuccess("清空[" + keyTemplate + "]成功");
-        this.doGetKeyList(this.keyTemplate);
-      })
-    },
+    }
   },
 };
 </script>
diff --git a/yudao-ui-admin/src/views/infra/server/index.vue b/yudao-ui-admin/src/views/infra/server/index.vue
index 7a5570cc2..409bd7325 100644
--- a/yudao-ui-admin/src/views/infra/server/index.vue
+++ b/yudao-ui-admin/src/views/infra/server/index.vue
@@ -1,18 +1,30 @@
 <template>
   <div>
     <doc-alert title="服务监控" url="https://doc.iocoder.cn/server-monitor/" />
-    <i-frame :src="url" />
+    <i-frame v-if="!loading" :src="url" />
   </div>
 </template>
 <script>
 import iFrame from "@/components/iFrame/index";
+import { getConfigKey } from "@/api/infra/config";
 export default {
   name: "Druid",
   components: { iFrame },
   data() {
     return {
-      url: process.env.VUE_APP_BASE_API + "/admin/applications"
+      url: process.env.VUE_APP_BASE_API + "/admin/applications",
+      loading: true
     };
   },
+  created() {
+    getConfigKey("url.spring-boot-admin").then(response => {
+      if (!response.data || response.data.length === 0) {
+        return
+      }
+      this.url = response.data;
+    }).finally(() => {
+      this.loading = false;
+    })
+  }
 };
 </script>
diff --git a/yudao-ui-admin/src/views/infra/skywalking/index.vue b/yudao-ui-admin/src/views/infra/skywalking/index.vue
index 4628d619d..6f5e7dc7f 100644
--- a/yudao-ui-admin/src/views/infra/skywalking/index.vue
+++ b/yudao-ui-admin/src/views/infra/skywalking/index.vue
@@ -1,18 +1,30 @@
 <template>
   <div>
     <doc-alert title="服务监控" url="https://doc.iocoder.cn/server-monitor/" />
-    <i-frame :src="url" />
+    <i-frame v-if="!loading" :src="url" />
   </div>
 </template>
 <script>
 import iFrame from "@/components/iFrame/index";
+import { getConfigKey } from "@/api/infra/config";
 export default {
   name: "Druid",
   components: { iFrame },
   data() {
     return {
-      url: "http://skywalking.shop.iocoder.cn", // TODO 芋艿，后续改成配置读取
+      url: "http://skywalking.shop.iocoder.cn",
+      loading: true
     };
   },
+  created() {
+    getConfigKey("url.skywalking").then(response => {
+      if (!response.data || response.data.length === 0) {
+        return
+      }
+      this.url = response.data;
+    }).finally(() => {
+      this.loading = false;
+    })
+  }
 };
 </script>
diff --git a/yudao-ui-admin/src/views/infra/swagger/index.vue b/yudao-ui-admin/src/views/infra/swagger/index.vue
index 3cf0d8ab3..0558fa694 100644
--- a/yudao-ui-admin/src/views/infra/swagger/index.vue
+++ b/yudao-ui-admin/src/views/infra/swagger/index.vue
@@ -1,19 +1,31 @@
 <template>
   <div>
     <doc-alert title="接口文档" url="https://doc.iocoder.cn/api-doc/" />
-    <i-frame :src="url" />
+    <i-frame v-if="!loading" :src="url" />
   </div>
 </template>
 <script>
 import iFrame from "@/components/iFrame/index";
+import { getConfigKey } from "@/api/infra/config";
 export default {
   name: "Druid",
   components: { iFrame },
   data() {
     return {
-      // url: process.env.VUE_APP_BASE_API + "/doc.html"
-      url: process.env.VUE_APP_BASE_API + "/swagger-ui"
+      url: process.env.VUE_APP_BASE_API + "/doc.html", // Knife4j UI
+      // url: process.env.VUE_APP_BASE_API + "/swagger-ui", // Swagger UI
+      loading: true
     };
   },
+  created() {
+    getConfigKey("url.swagger").then(response => {
+      if (!response.data || response.data.length === 0) {
+        return
+      }
+      this.url = response.data;
+    }).finally(() => {
+      this.loading = false;
+    })
+  }
 };
 </script>