ddm-plugin-dubbo-support 0.3.2 → 0.3.3

package/README.md

@@ -11,20 +11,20 @@
 
 **服务测试**：服务测试（目前已支持Telnet、dubbo、http 等协议）、 `invoke` 命令生成、参数填充、响应对比
 
-![alt text](./docs/images/projectPage.png)
+![alt text](https://cdn.jsdelivr.net/npm/ddm-plugin-dubbo-support/docs/images/projectPage.png)
 
-![alt text](./docs/images/addProject.png)
+![alt text](https://cdn.jsdelivr.net/npm/ddm-plugin-dubbo-support/docs/images/addProject.png)
 
-![alt text](./docs/images/telnet.png)
+![alt text](https://cdn.jsdelivr.net/npm/ddm-plugin-dubbo-support/docs/images/telnet.png)
 
 
 # 常见问题
 ### 如何连接到dubbo-admin?
 1. 打开dubbo-admin并且打开F12
 2. 从控制台找到一个发往后台的请求地址，拿到它的前缀
-![alt text](./docs/images/getDubboAdminUrl.png)
+![alt text](https://cdn.jsdelivr.net/npm/ddm-plugin-dubbo-support/docs/images/getDubboAdminUrl.png)
 3. 新建连接，选择dubbo-admin
-![alt text](./docs/images/connectDubboAdmin.png)
+![alt text](https://cdn.jsdelivr.net/npm/ddm-plugin-dubbo-support/docs/images/connectDubboAdmin.png)
 
 
 

package/dist/index.js

@@ -211,9 +211,7 @@ class ZookeeperDataSource {
     const exculdeName = ["mapping", "config", "metadata"];
     const serviceList = children.filter(e => !exculdeName.find(name => name === e)).map(e => {
       return {
-        serviceName: e,
-        uniqueServiceName: e,
-        type: 'dubbo'
+        serviceName: e
       };
     });
     logger__WEBPACK_IMPORTED_MODULE_6___default().info(`【接口模式】-查询服务列表 耗时：${Date.now() - startTime}ms`);
@@ -286,7 +284,6 @@ class ZookeeperDataSource {
           serviceList.push({
             application,
             serviceName: service.name,
-            uniqueServiceName: service.name,
             type: 'dubbo'
           });
         });
@@ -317,7 +314,6 @@ class ZookeeperDataSource {
         serviceList.push({
           application,
           serviceName,
-          uniqueServiceName: serviceName,
           discoverMode: 'mapping'
         });
       });
@@ -444,7 +440,6 @@ class ZookeeperDataSource {
       protocol: applicationMetadata.protocol,
       application: instanceData.name,
       serviceName: serviceInfo.serviceName,
-      uniqueServiceName: serviceInfo.uniqueServiceName || serviceInfo.serviceName,
       version: applicationMetadata.version || metadataParams?.version || '',
       methods: Array.from(new Set((metadataParams.methods || "").split(",").filter(Boolean))),
       revision: metadataParams.revision,
@@ -614,7 +609,6 @@ class ZookeeperDataSource {
       address: `${urlData.host}:${urlData.port}`,
       application: urlData.params.application,
       serviceName: urlData.params.interface,
-      uniqueServiceName: urlData.params.interface,
       version: urlData.params.version,
       weight: urlData.params.weight,
       // 是否过时
@@ -49870,7 +49864,7 @@ class NacosDataSource {
     // let url = `${dataSourceInfo.address}/nacos/v1/ns/instance/list`;
 
     // let params = {
-    //     serviceName: serviceInfo.uniqueServiceName,
+    //     serviceName: xxx,
     //     namespaceId: dataSourceInfo.namespaceId || "",
     //     groupName: dataSourceInfo.groupName || "",
     //     accessToken: await this.getAccessToken(dataSourceInfo)
@@ -52858,11 +52852,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var logger__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(logger__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(16);
-/* harmony import */ var _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(398);
-/* harmony import */ var _main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(202);
-/* harmony import */ var _main_generator_ParamGeneratorAdapter__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(203);
-/* harmony import */ var _main_invoker___WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(346);
+/* harmony import */ var appConfig__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(362);
+/* harmony import */ var appConfig__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(appConfig__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(16);
+/* harmony import */ var _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(398);
+/* harmony import */ var _main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(202);
+/* harmony import */ var _main_generator_ParamGeneratorAdapter__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(203);
+/* harmony import */ var _main_invoker___WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(346);
+
 
 
 
@@ -52876,35 +52873,38 @@ __webpack_require__.r(__webpack_exports__);
  */
 class Nacos3DataSource {
   async getServiceList(dataSourceInfo) {
-    const applicationServiceList = dataSourceInfo.instanceMode !== false ? await this.getApplicationServiceList(dataSourceInfo) : [];
-    const interfaceServiceList = dataSourceInfo.interfaceMode !== false ? await this.getInterfaceServiceList(dataSourceInfo) : [];
+    const nacosServiceList = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_3__["default"].getNacosServiceList(dataSourceInfo);
+    const applicationServiceList = dataSourceInfo.instanceMode !== false ? await this.getApplicationServiceList(dataSourceInfo, nacosServiceList) : [];
+    const interfaceServiceList = dataSourceInfo.interfaceMode !== false ? await this.getInterfaceServiceList(dataSourceInfo, nacosServiceList) : [];
     return {
       list: this.mergeServiceList(interfaceServiceList, applicationServiceList),
       separator: '.',
       packageSeparator: '.'
     };
   }
-  async getApplicationServiceList(dataSourceInfo) {
+  async getApplicationServiceList(dataSourceInfo, nacosServiceList) {
     const serviceList = [];
     let startTime = Date.now();
     try {
-      serviceList.push(...(await this.getServiceListByApplicationMatedata(dataSourceInfo)));
-      logger__WEBPACK_IMPORTED_MODULE_0___default().info(`【Nacos3应用模式】-查询服务列表 耗时：${Date.now() - startTime}ms`);
+      serviceList.push(...(await this.getServiceListByApplicationMatedata(dataSourceInfo, nacosServiceList)));
+      logger__WEBPACK_IMPORTED_MODULE_0___default().info(`[ Nacos3 应用模式 ] 查询服务列表 耗时：${Date.now() - startTime}ms`);
     } catch (e) {
-      logger__WEBPACK_IMPORTED_MODULE_0___default().error(`【Nacos3应用模式】-查询服务列表 失败 耗时：${Date.now() - startTime}ms`, e);
+      logger__WEBPACK_IMPORTED_MODULE_0___default().error(`[ Nacos3 应用模式 ] 查询服务列表 失败 耗时：${Date.now() - startTime}ms`, e);
     }
-    startTime = Date.now();
-    try {
-      serviceList.push(...(await this.getServiceListByMapping(dataSourceInfo, new Set(serviceList.map(item => item.serviceName)))));
-      logger__WEBPACK_IMPORTED_MODULE_0___default().info(`【Nacos3 应用模式-兜底反推】-查询服务列表 耗时：${Date.now() - startTime}ms`);
-    } catch (e) {
-      logger__WEBPACK_IMPORTED_MODULE_0___default().error(`【Nacos3 应用模式-兜底反推】-查询服务列表 失败 耗时：${Date.now() - startTime}ms`, e);
+    if (dataSourceInfo.useApplicationMapping === true) {
+      startTime = Date.now();
+      try {
+        serviceList.push(...(await this.getServiceListByMapping(dataSourceInfo, new Set(serviceList.map(item => item.serviceName)))));
+        logger__WEBPACK_IMPORTED_MODULE_0___default().info(`[ Nacos3 应用模式-兜底反推 ] 查询服务列表 耗时：${Date.now() - startTime}ms`);
+      } catch (e) {
+        logger__WEBPACK_IMPORTED_MODULE_0___default().error(`[ Nacos3 应用模式-兜底反推 ] 查询服务列表 失败 耗时：${Date.now() - startTime}ms`, e);
+      }
     }
     return serviceList;
   }
-  async getServiceListByApplicationMatedata(dataSourceInfo) {
+  async getServiceListByApplicationMatedata(dataSourceInfo, nacosServiceList) {
     const serviceList = [];
-    for (const application of await this.getAppNameList(dataSourceInfo)) {
+    for (const application of await this.getAppNameList(dataSourceInfo, nacosServiceList)) {
       const cache = new Set();
       for (const instance of await this.getAppInstanceList(dataSourceInfo, application)) {
         const revision = this.getMetadataRevision(instance);
@@ -52936,17 +52936,16 @@ class Nacos3DataSource {
     return serviceList;
   }
   async getServiceListByMapping(dataSourceInfo, excludeServiceNameSet) {
-    const configList = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getConfigList(dataSourceInfo, "", "mapping");
+    const configList = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_3__["default"].getConfigList(dataSourceInfo, "", "mapping");
     return configList.filter(config => !excludeServiceNameSet.has(config.dataId)).map(config => ({
       application: config.content,
       serviceName: config.dataId,
       discoverMode: 'mapping'
     }));
   }
-  async getInterfaceServiceList(dataSourceInfo) {
-    const serviceNameList = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getNacosServiceList(dataSourceInfo);
+  async getInterfaceServiceList(dataSourceInfo, nacosServiceList) {
     const serviceList = new Set();
-    for (const serviceName of serviceNameList) {
+    for (const serviceName of nacosServiceList) {
       const datas = serviceName.split(":");
       if (datas[0] !== "providers") {
         continue;
@@ -52970,9 +52969,15 @@ class Nacos3DataSource {
   }
   async getProviderList(dataSourceInfo, serviceInfo) {
     if (serviceInfo.application && serviceInfo.discoverMode !== 'mapping') {
+      if (appConfig__WEBPACK_IMPORTED_MODULE_1___default().getPluginProperty('logEnable') === true) {
+        logger__WEBPACK_IMPORTED_MODULE_0___default().info(`查询提供者 应用模式查询提供者 serviceName:${serviceInfo.serviceName}`);
+      }
       return await this.getApplicationProviderList(dataSourceInfo, serviceInfo);
     }
-    const providerNameList = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getProviderNameList(dataSourceInfo, serviceInfo.serviceName);
+    if (appConfig__WEBPACK_IMPORTED_MODULE_1___default().getPluginProperty('logEnable') === true) {
+      logger__WEBPACK_IMPORTED_MODULE_0___default().info(`查询提供者 接口模式 serviceName:${serviceInfo.serviceName}`);
+    }
+    const providerNameList = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_3__["default"].getProviderNameList(dataSourceInfo, serviceInfo.serviceName);
     if (serviceInfo.discoverMode === 'mapping' && providerNameList.length === 0) {
       throw new Error(`你当前接口是dubbo3应用模式，需要开启配置[dubbo.application.metadata-type=remote]才能获取到提供者列表`);
     }
@@ -52980,14 +52985,14 @@ class Nacos3DataSource {
     for (const providerName of providerNameList) {
       const serviceDisabledMap = new Map();
       const serviceMetadataMap = new Map();
-      const instanceList = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getInstanceList(dataSourceInfo, providerName);
+      const instanceList = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_3__["default"].getInstanceList(dataSourceInfo, providerName);
       if (instanceList.length === 0) {
         continue;
       }
       for (const instance of instanceList) {
         let providerInfo = this.parseProvderInfo(instance);
         const disabledAddresses = await serviceDisabledMap.computeIfAbsent(this.buildDataId(providerInfo), async () => {
-          return _main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_3__["default"].getDisableAddresses(await this.getJsonConfiguration(dataSourceInfo, serviceInfo, providerInfo));
+          return _main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_4__["default"].getDisableAddresses(await this.getJsonConfiguration(dataSourceInfo, serviceInfo, providerInfo));
         });
         providerInfo.disabled = disabledAddresses.find(item => item === '0.0.0.0' || item === providerInfo.address) != null;
         const key = `${providerInfo.application}-${providerInfo.serviceName}-${providerInfo.version}-${providerInfo.group}`;
@@ -53003,16 +53008,16 @@ class Nacos3DataSource {
       application,
       serviceName
     } = serviceInfo;
+    const startTime = Date.now();
     const providerList = [];
     const cache = new Map();
-    const instanceList = await this.getAppInstanceList(dataSourceInfo, application);
-    for (const instance of instanceList) {
+    for (const instance of await this.getAppInstanceList(dataSourceInfo, application)) {
       const revision = this.getMetadataRevision(instance);
       if (!revision) {
         continue;
       }
       const appMetadata = await cache.computeIfAbsent(`a-${revision}`, () => this.getAppMetadata(dataSourceInfo, application, revision));
-      if (!appMetadata || !appMetadata.services) {
+      if (!appMetadata?.services) {
         continue;
       }
       const appServiceMetadatas = Object.values(appMetadata.services).filter(service => {
@@ -53027,6 +53032,9 @@ class Nacos3DataSource {
         providerList.push(providerInfo);
       }
     }
+    if (appConfig__WEBPACK_IMPORTED_MODULE_1___default().getPluginProperty('logEnable') === true) {
+      logger__WEBPACK_IMPORTED_MODULE_0___default().info(`[  Nacos3Utils  ] 查询到提供者列表 params:${serviceName}, 提供者数量:${providerList.length}， 耗时：${Date.now() - startTime}ms`);
+    }
     return providerList;
   }
   resolveMethodList(methods, metadata) {
@@ -53035,7 +53043,7 @@ class Nacos3DataSource {
         ...method,
         name: `${method.name}(${method.parameterTypes.map(pp => pp.substring(pp.lastIndexOf(".") + 1))})`,
         methodName: method.name,
-        defaultParameter: JSON.stringify(_main_generator_ParamGeneratorAdapter__WEBPACK_IMPORTED_MODULE_4__["default"].generateParam(metadata, method.name), null, 2) || "[]"
+        defaultParameter: JSON.stringify(_main_generator_ParamGeneratorAdapter__WEBPACK_IMPORTED_MODULE_5__["default"].generateParam(metadata, method.name), null, 2) || "[]"
       }));
     }
     return methods.map(method => ({
@@ -53072,31 +53080,31 @@ class Nacos3DataSource {
   }
   async disableProvider(dataSourceInfo, serviceInfo, providerInfo) {
     let doc = await this.getJsonConfiguration(dataSourceInfo, serviceInfo, providerInfo);
-    doc = await _main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_3__["default"].addDisableProvider(doc, providerInfo.address);
+    doc = await _main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_4__["default"].addDisableProvider(doc, providerInfo.address);
     await this.doSaveConfiguration(dataSourceInfo, serviceInfo, providerInfo, doc);
   }
   async enableProvider(dataSourceInfo, serviceInfo, providerInfo) {
     let doc = await this.getJsonConfiguration(dataSourceInfo, serviceInfo, providerInfo);
-    doc = await _main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_3__["default"].removeDisableProvider(doc, providerInfo.address);
+    doc = await _main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_4__["default"].removeDisableProvider(doc, providerInfo.address);
     await this.doSaveConfiguration(dataSourceInfo, serviceInfo, providerInfo, doc);
   }
   async getConfiguration(dataSourceInfo, serviceInfo, providerInfo) {
-    const config = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getConfig(dataSourceInfo, this.buildDataId(providerInfo), dataSourceInfo.group || 'dubbo');
-    return config ? config : _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_1__["default"].JSONToYaml(_main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_3__["default"].createDubboDefaultConfiguration());
+    const config = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_3__["default"].getConfig(dataSourceInfo, this.buildDataId(providerInfo), dataSourceInfo.group || 'dubbo');
+    return config ? config : _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_2__["default"].JSONToYaml(_main_common_DubboConfigurationUtils__WEBPACK_IMPORTED_MODULE_4__["default"].createDubboDefaultConfiguration());
   }
   async getJsonConfiguration(dataSourceInfo, serviceInfo, providerInfo) {
-    return _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_1__["default"].yamlToJSON(await this.getConfiguration(dataSourceInfo, serviceInfo, providerInfo));
+    return _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_2__["default"].yamlToJSON(await this.getConfiguration(dataSourceInfo, serviceInfo, providerInfo));
   }
   async saveConfiguration(dataSourceInfo, serviceInfo, providerInfo, ymal) {
-    await this.doSaveConfiguration(dataSourceInfo, serviceInfo, providerInfo, _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_1__["default"].yamlToJSON(ymal));
+    await this.doSaveConfiguration(dataSourceInfo, serviceInfo, providerInfo, _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_2__["default"].yamlToJSON(ymal));
   }
   async doSaveConfiguration(dataSourceInfo, serviceInfo, providerInfo, doc) {
     const dataId = this.buildDataId(providerInfo);
-    const config = doc?.configs?.length > 0 ? _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_1__["default"].JSONToYaml(doc) : null;
-    await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].saveConfig(dataSourceInfo, dataId, dataSourceInfo.group || 'dubbo', config);
+    const config = doc?.configs?.length > 0 ? _main_common_YamlUtils__WEBPACK_IMPORTED_MODULE_2__["default"].JSONToYaml(doc) : null;
+    await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_3__["default"].saveConfig(dataSourceInfo, dataId, dataSourceInfo.group || 'dubbo', config);
   }
   async invokeMethod(dataSourceInfo, serviceInfo, provder, methodInfo, code, invokerType) {
-    return _main_invoker___WEBPACK_IMPORTED_MODULE_5__["default"].invokeMethod(provder, methodInfo, code, invokerType);
+    return _main_invoker___WEBPACK_IMPORTED_MODULE_6__["default"].invokeMethod(provder, methodInfo, code, invokerType);
   }
   buildDataId({
     serviceName,
@@ -53145,9 +53153,11 @@ class Nacos3DataSource {
       qosPort: data.qosPort || data.port
     };
   }
-  async getAppNameList(dataSourceInfo) {
-    const serviceList = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getNacosServiceList(dataSourceInfo);
-    return serviceList.filter(serviceName => {
+  async getAppNameList(dataSourceInfo, nacosServiceList) {
+    // 使用共享的服务列表
+    // const serviceList = await nacos3Utils.getNacosServiceList(dataSourceInfo);
+
+    return nacosServiceList.filter(serviceName => {
       const datas = serviceName.split(":");
       if (datas[0] === "providers" || datas[0] === "consumers") {
         return false;
@@ -53156,7 +53166,7 @@ class Nacos3DataSource {
     });
   }
   async getAppInstanceList(dataSourceInfo, application) {
-    return await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getInstanceList(dataSourceInfo, application);
+    return await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_3__["default"].getInstanceList(dataSourceInfo, application);
   }
   async getAppMetadata(dataSourceInfo, application, revision) {
     return (await this.getJsonConfig(dataSourceInfo, application, revision)) || {};
@@ -53166,7 +53176,7 @@ class Nacos3DataSource {
     return (await this.getJsonConfig(dataSourceInfo, dataId, dataSourceInfo.group || 'dubbo')) || {};
   }
   async getJsonConfig(dataSourceInfo, dataId, groupName) {
-    const config = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_2__["default"].getConfig(dataSourceInfo, dataId, groupName);
+    const config = await _main_datasource_nacos3_Nacos3Utils__WEBPACK_IMPORTED_MODULE_3__["default"].getConfig(dataSourceInfo, dataId, groupName);
     if (!config) {
       return null;
     }
@@ -53197,8 +53207,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(368);
-/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(368);
+/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8);
+/* harmony import */ var logger__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(logger__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var appConfig__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(362);
+/* harmony import */ var appConfig__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(appConfig__WEBPACK_IMPORTED_MODULE_2__);
+
+
 
 
 class Nacos3Utils {
@@ -53215,7 +53231,11 @@ class Nacos3Utils {
       withInstances: false,
       accessToken: await this.getAccessToken(dataSourceInfo)
     };
+    let queryCount = 0;
+    let queryServiceCount = 0;
+    const startTime = Date.now();
     do {
+      queryCount++;
       const {
         data
       } = await axios__WEBPACK_IMPORTED_MODULE_0___default().get(url, {
@@ -53227,11 +53247,15 @@ class Nacos3Utils {
           serviceList.push(item.name);
         }
       });
+      queryServiceCount += pageItems.length;
       if (pageItems.length < params.pageSize) {
         break;
       }
       params.pageNo++;
     } while (true);
+    if (appConfig__WEBPACK_IMPORTED_MODULE_2___default().getPluginProperty('logEnable') === true) {
+      logger__WEBPACK_IMPORTED_MODULE_1___default().info(`[ Nacos3Utils ] -查询Nacos服务列表 queryCount:${queryCount}, queryServiceCount:${queryServiceCount}, 实际接口数:${serviceList.length}， 耗时：${Date.now() - startTime}ms`);
+    }
     return serviceList;
   }
   async getProviderNameList(dataSourceInfo, serviceName = '*') {
@@ -53247,7 +53271,11 @@ class Nacos3Utils {
       withInstances: false,
       accessToken: await this.getAccessToken(dataSourceInfo)
     };
+    let queryCount = 0;
+    let queryServiceCount = 0;
+    const startTime = Date.now();
     do {
+      queryCount++;
       const {
         data
       } = await axios__WEBPACK_IMPORTED_MODULE_0___default().get(url, {
@@ -53259,11 +53287,15 @@ class Nacos3Utils {
           providerNameList.push(item.name);
         }
       });
+      queryServiceCount += pageItems.length;
       if (pageItems.length < params.pageSize) {
         break;
       }
       params.pageNo++;
     } while (true);
+    if (appConfig__WEBPACK_IMPORTED_MODULE_2___default().getPluginProperty('logEnable') === true) {
+      logger__WEBPACK_IMPORTED_MODULE_1___default().info(`[ Nacos3Utils ] 查询到提供者列表 serviceName:${serviceName}, queryCount:${queryCount}, queryServiceCount:${queryServiceCount}, 实际提供者数:${providerNameList.length}， 耗时：${Date.now() - startTime}ms`);
+    }
     return providerNameList;
   }
   async getInstanceList(dataSourceInfo, serviceName) {
@@ -53292,6 +53324,14 @@ class Nacos3Utils {
     } while (true);
     return result;
   }
+
+  /**
+   * 这个接口性能很差，慎用，nacos1、2会直接返回content,但是nacos3不会，只能一个个去查了，所以性能很差
+   * @param {*} dataSourceInfo 
+   * @param {*} dataId 
+   * @param {*} groupName 
+   * @returns 
+   */
   async getConfigList(dataSourceInfo, dataId, groupName) {
     const url = `${dataSourceInfo.address}/v3/console/cs/config/list`;
     const params = {
@@ -53307,7 +53347,11 @@ class Nacos3Utils {
       accessToken: await this.getAccessToken(dataSourceInfo)
     };
     const result = [];
+    let queryCount = 0;
+    let queryConfigCount = 0;
+    const startTime = Date.now();
     do {
+      queryCount++;
       const {
         data
       } = await axios__WEBPACK_IMPORTED_MODULE_0___default().get(url, {
@@ -53316,21 +53360,26 @@ class Nacos3Utils {
       const pageItems = data?.data?.pageItems || [];
       for (let i = 0; i < pageItems.length; i++) {
         const item = pageItems[i];
-        if (item.content) {
-          result.push(item);
-          continue;
-        }
+        // if (item.content) {
+        //     result.push(item);
+        //     continue;
+        // }
+
         const content = await this.getConfig(dataSourceInfo, item.dataId, groupName);
         result.push({
           ...item,
           content
         });
       }
+      queryConfigCount += pageItems.length;
       if (pageItems.length < params.pageSize) {
         break;
       }
       params.pageNo++;
     } while (true);
+    if (appConfig__WEBPACK_IMPORTED_MODULE_2___default().getPluginProperty('logEnable') === true) {
+      logger__WEBPACK_IMPORTED_MODULE_1___default().info(`[ Nacos3Utils ] 查询到提供者列表 dataId:${dataId}, group:${groupName}, queryCount:${queryCount}, queryConfigCount:${queryConfigCount}, 实际配置数:${result.length}， 耗时：${Date.now() - startTime}ms`);
+    }
     return result;
   }
   async getConfig(dataSourceInfo, dataId, groupName) {
@@ -53366,7 +53415,7 @@ class Nacos3Utils {
     if (config) {
       params.content = config;
       params.type = 'yaml';
-      await axios__WEBPACK_IMPORTED_MODULE_0___default().post(url, qs__WEBPACK_IMPORTED_MODULE_1___default().stringify(params));
+      await axios__WEBPACK_IMPORTED_MODULE_0___default().post(url, qs__WEBPACK_IMPORTED_MODULE_3___default().stringify(params));
     } else {
       await axios__WEBPACK_IMPORTED_MODULE_0___default()["delete"](url, {
         params
@@ -53384,7 +53433,7 @@ class Nacos3Utils {
     const url = `${dataSourceInfo.address}/v3/auth/user/login`;
     const {
       data
-    } = await axios__WEBPACK_IMPORTED_MODULE_0___default().post(url, qs__WEBPACK_IMPORTED_MODULE_1___default().stringify(params));
+    } = await axios__WEBPACK_IMPORTED_MODULE_0___default().post(url, qs__WEBPACK_IMPORTED_MODULE_3___default().stringify(params));
     return data?.accessToken;
   }
   unwrap(response) {
@@ -53443,9 +53492,7 @@ class EtcdDataSource {
     const exculdeName = ["mapping", "config", "metadata"];
     const serviceList = children.filter(e => !exculdeName.find(name => name == e)).map(e => {
       return {
-        serviceName: e,
-        uniqueServiceName: e,
-        type: 'dubbo'
+        serviceName: e
       };
     });
     logger__WEBPACK_IMPORTED_MODULE_5___default().info(`【etcd接口模式】-查询服务列表 耗时：${Date.now() - startTime}ms`);
@@ -53497,9 +53544,7 @@ class EtcdDataSource {
           cache.add(primaryKey);
           serviceList.push({
             application,
-            serviceName,
-            uniqueServiceName: serviceName,
-            type: 'dubbo'
+            serviceName
           });
         });
       }
@@ -53519,7 +53564,6 @@ class EtcdDataSource {
         serviceList.push({
           application,
           serviceName,
-          uniqueServiceName: serviceName,
           discoverMode: 'mapping'
         });
       });
@@ -53623,7 +53667,6 @@ class EtcdDataSource {
       protocol: applicationMetadata.protocol,
       application: serviceInfo.application,
       serviceName: serviceInfo.serviceName,
-      uniqueServiceName: serviceInfo.uniqueServiceName || serviceInfo.serviceName,
       version: applicationMetadata.version || metadataParams?.version || '',
       group: applicationMetadata.group || metadataParams?.group || '',
       methods: Array.from(new Set((metadataParams.methods || "").split(",").filter(Boolean))),
@@ -53707,7 +53750,6 @@ class EtcdDataSource {
       port: urlData.port,
       address: `${urlData.host}:${urlData.port}`,
       serviceName: urlData.params.interface,
-      uniqueServiceName: urlData.params.interface,
       version: urlData.params.version,
       group: urlData.params.group,
       weight: urlData.params.weight,