版本升级至3.4.0

合并企业版分支
合并Master分支
2025-12-30 08:02:11 +08:00 · 2023-12-03 15:24:11 +08:00 · 2023-12-03 14:40:40 +08:00 · 2023-07-07 13:01:27 +08:00 · 2023-02-27 18:43:48 +08:00
23 changed files with 93 additions and 202 deletions
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@

 👍 我们正在组建国内最大，最权威的 **[Kafka中文社区](https://z.didi.cn/5gSF9)**

-在这里你可以结交各大互联网的 Kafka大佬 以及 6200+ Kafka爱好者，一起实现知识共享，实时掌控最新行业资讯，期待 👏 &nbsp; 您的加入中～ https://z.didi.cn/5gSF9
+在这里你可以结交各大互联网的 Kafka大佬 以及 4000+ Kafka爱好者，一起实现知识共享，实时掌控最新行业资讯，期待 👏 &nbsp; 您的加入中～ https://z.didi.cn/5gSF9

 有问必答~！ 互动有礼~！

@@ -146,7 +146,7 @@ PS: 提问请尽量把问题一次性描述清楚，并告知环境信息情况

 **`2、微信群`**

-微信加群：添加`PenceXie` 的微信号备注KnowStreaming加群。
+微信加群：添加`PenceXie` 、`szzdzhp001`的微信号备注KnowStreaming加群。
 <br/>

 加群之前有劳点一下 star，一个小小的 star 是对KnowStreaming作者们努力建设社区的动力。
--- a/docs/dev_guide/MYSQL密码加密手册.md
+++ b/docs/dev_guide/MYSQL密码加密手册.md
@@ -1,115 +0,0 @@
-## YML文件MYSQL密码加密存储手册
-
-### 1、本地部署加密
-
-**第一步：生成密文**
-
-在本地仓库中找到jasypt-1.9.3.jar，默认在org/jasypt/jasypt/1.9.3中，使用`java -cp`生成密文。
-
-```bash
-java -cp jasypt-1.9.3.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI input=mysql密码 password=加密的salt algorithm=PBEWithMD5AndDES
-```
-
-```bash
-## 得到密文
-DYbVDLg5D0WRcJSCUGWjiw==
-```
-
-**第二步：配置jasypt**
-
-在YML文件中配置jasypt，例如
-
-```yaml
-jasypt:
-  encryptor:
-    algorithm: PBEWithMD5AndDES
-    iv-generator-classname: org.jasypt.iv.NoIvGenerator
-```
-
-**第三步：配置密文**
-
-使用密文替换YML文件中的明文密码为ENC(密文），例如[application.yml](https://github.com/didi/KnowStreaming/blob/master/km-rest/src/main/resources/application.yml)中MYSQL密码。
-
-```yaml
-know-streaming: 
-  username: root
-  password: ENC(DYbVDLg5D0WRcJSCUGWjiw==)
-```
-
-**第四步：配置加密的salt（选择其一）**
-
- 配置在YML文件中（不推荐）
-
-```yaml
-jasypt:
-  encryptor:
-    password: salt
-```
-
- 配置程序启动时的命令行参数
-
-```bash
-java -jar xxx.jar --jasypt.encryptor.password=salt
-```
-
- 配置程序启动时的环境变量
-
-```bash
-export JASYPT_PASSWORD=salt
-java -jar xxx.jar --jasypt.encryptor.password=${JASYPT_PASSWORD}
-```
-
-## 2、容器部署加密
-
-利用docker swarm 提供的 secret 机制加密存储密码，使用docker swarm来管理密码。
-
-### 2.1、secret加密存储
-
-**第一步：初始化docker swarm**
-
-```bash
-docker swarm init
-```
-
-**第二步：创建密钥**
-
-```bash
-echo "admin2022_" | docker secret create mysql_password -
-
-# 输出密钥
-f964wi4gg946hu78quxsh2ge9
-```
-
-**第三步：使用密钥**
-
-```yaml
-# mysql用户密码
-SERVER_MYSQL_USER: root
-SERVER_MYSQL_PASSWORD: mysql_password
-
-knowstreaming-mysql:
-    # root 用户密码
-    MYSQL_ROOT_PASSWORD: mysql_password
-secrets:
-  mysql_password:
-    external: true
-```
-
-### 2.2、使用密钥文件加密
-
-**第一步：创建密钥**
-
-```bash
-echo "admin2022_" > password
-```
-
-**第二步：使用密钥**
-
-```yaml
-# mysql用户密码
-SERVER_MYSQL_USER: root
-SERVER_MYSQL_PASSWORD: mysql_password
-secrets:
-  mysql_password:
-    file: ./password
-```
--- a/km-console/packages/config-manager-fe/package.json
+++ b/km-console/packages/config-manager-fe/package.json
@@ -35,7 +35,7 @@
  },
  "devDependencies": {
    "@ant-design/icons": "^4.6.2",
-    "@babel/core": "^7.5.5",
+    "@babel/core": "^7.18.13",
    "@babel/plugin-proposal-class-properties": "^7.4.0",
    "@babel/plugin-proposal-decorators": "^7.4.0",
    "@babel/plugin-proposal-export-default-from": "^7.2.0",
@@ -50,7 +50,7 @@
    "@babel/preset-react": "^7.0.0",
    "@babel/preset-typescript": "^7.14.5",
    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
-    "@types/lodash": "^4.14.138",
+    "@types/lodash": "^4.14.184",
    "@types/react-dom": "^17.0.5",
    "@types/react-router": "5.1.18",
    "@types/react-router-dom": "^5.3.3",
@@ -76,6 +76,7 @@
    "hard-source-webpack-plugin": "^0.13.1",
    "html-webpack-plugin": "^4.0.0",
    "husky": "4.3.7",
+    "knowdesign": "^1.3.7",
    "less-loader": "^4.1.0",
    "lint-staged": "10.5.3",
    "mini-css-extract-plugin": "^1.3.0",
--- a/km-console/packages/layout-clusters-fe/config/CoverHtmlWebpackPlugin.js
+++ b/km-console/packages/layout-clusters-fe/config/CoverHtmlWebpackPlugin.js
@@ -109,7 +109,15 @@ class CoverHtmlWebpackPlugin {
                  <script src='${isProd ? PublicPath : ''}/static/js/named-exports.min.js'></script>
                  <script src='${isProd ? PublicPath : ''}/static/js/use-default.min.js'></script>
                  <script src='${isProd ? PublicPath : ''}/static/js/amd.js'></script>
-                  ${process.env.BUSINESS_VERSION === 'true' ? `<script src=${isProd ? PublicPath : ''}/static/js/ksl.min.js></script>` : ''}
+                  <script>
+                    var _hmt = _hmt || [];
+                    (function() {
+                      var hm = document.createElement("script");
+                      hm.src = "https://hm.baidu.com/hm.js?16d7da6d1dd79237d801ee55809cfe90";
+                      var s = document.getElementsByTagName("script")[0]; 
+                      s.parentNode.insertBefore(hm, s);
+                    })();
+                  </script>
                </head>
                <body>
                  ${depsMap}
--- a/km-console/packages/layout-clusters-fe/package.json
+++ b/km-console/packages/layout-clusters-fe/package.json
@@ -64,7 +64,7 @@
    "webpack-bundle-analyzer": "^4.5.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.5.5",
+    "@babel/core": "^7.18.13",
    "@babel/plugin-proposal-class-properties": "^7.4.0",
    "@babel/plugin-proposal-decorators": "^7.4.0",
    "@babel/plugin-proposal-export-default-from": "^7.2.0",
@@ -79,7 +79,7 @@
    "@babel/preset-typescript": "^7.14.5",
    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
    "@types/crypto-js": "^4.1.0",
-    "@types/lodash": "^4.14.171",
+    "@types/lodash": "^4.14.184",
    "@types/node": "^12.12.25",
    "@types/pubsub-js": "^1.5.18",
    "pubsub-js": "^1.5.18",
@@ -101,6 +101,7 @@
    "file-loader": "^6.0.0",
    "hard-source-webpack-plugin": "^0.13.1",
    "husky": "4.3.7",
+    "knowdesign": "^1.3.7",
    "less": "^3.9.0",
    "less-loader": "^4.1.0",
    "lint-staged": "10.5.3",
--- a/km-console/packages/layout-clusters-fe/src/app.tsx
+++ b/km-console/packages/layout-clusters-fe/src/app.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 /* eslint-disable no-constant-condition */
 import '@babel/polyfill';
 import React, { useState, useEffect, useLayoutEffect } from 'react';
@@ -88,6 +89,17 @@ const AppContent = (props: { setlanguage: (language: string) => void }) => {
    } else {
      setCurActiveAppName('cluster');
    }
+    // @ts-ignore
+    window._hmt = window._hmt || [];
+    // window._hmt.push([
+    //   '_setPageviewProperty',
+    //   {
+    //     page_name: 'test',
+    //     page_title: null, // 当属性值传入 null 时，其作用为删除此前设置的该 PV 属性
+    //   },
+    // ]);
+    // @ts-ignore
+    window._hmt.push(['_trackPageview', pathname]);
  }, [pathname]);

  // 获取版本信息
--- a/km-console/packages/layout-clusters-fe/src/assets/pro-tag.png
+++ b/km-console/packages/layout-clusters-fe/src/assets/pro-tag.png
--- a/km-console/packages/layout-clusters-fe/src/constants/common.ts
+++ b/km-console/packages/layout-clusters-fe/src/constants/common.ts
@@ -154,15 +154,15 @@ export const urlParser = () => {

 export const getLicenseInfo = (cbk: (msg: string) => void) => {
  if (process.env.BUSINESS_VERSION) {
-    const info = (window as any).code;
-    if (!info) {
-      setTimeout(() => getLicenseInfo(cbk), 1000);
-    } else {
-      const res = info() || {};
-      if (res.code !== 0) {
-        cbk(res.msg);
-      }
-    }
+    // const info = (window as any).code;
+    // if (!info) {
+    //   setTimeout(() => getLicenseInfo(cbk), 1000);
+    // } else {
+    //   const res = info() || {};
+    //   if (res.code !== 0) {
+    //     cbk(res.msg);
+    //   }
+    // }
  }
 };

--- a/km-console/packages/layout-clusters-fe/src/constants/menu.tsx
+++ b/km-console/packages/layout-clusters-fe/src/constants/menu.tsx
@@ -150,7 +150,14 @@ export const leftMenus = (clusterId?: string, clusterRunState?: number) => ({
      children: [
        process.env.BUSINESS_VERSION
          ? {
-              name: 'balance',
+              name: (intl: any) => {
+                return (
+                  <div className="menu-item-with-pro-tag">
+                    <span>{intl.formatMessage({ id: 'menu.cluster.operation.balance' })}</span>
+                    <div className="pro-tag"></div>
+                  </div>
+                );
+              },
              path: 'balance',
              icon: '#icon-luoji',
            }
@@ -164,19 +171,26 @@ export const leftMenus = (clusterId?: string, clusterRunState?: number) => ({
    },
    process.env.BUSINESS_VERSION
      ? {
-          name: 'produce-consume',
+          name: (intl: any) => {
+            return (
+              <div className="menu-item-with-pro-tag">
+                <span>{intl.formatMessage({ id: 'menu.cluster.produce-consume' })}</span>
+                <div className="pro-tag"></div>
+              </div>
+            );
+          },
          path: 'testing',
          icon: 'icon-Message',
          permissionPoint: [ClustersPermissionMap.TEST_CONSUMER, ClustersPermissionMap.TEST_PRODUCER],
          children: [
            {
-              name: 'producer',
+              name: (intl: any) => <span>{intl.formatMessage({ id: 'menu.cluster.produce-consume.producer' })}</span>,
              path: 'producer',
              icon: 'icon-luoji',
              permissionPoint: ClustersPermissionMap.TEST_PRODUCER,
            },
            {
-              name: 'consumer',
+              name: (intl: any) => <span>{intl.formatMessage({ id: 'menu.cluster.produce-consume.consumer' })}</span>,
              path: 'consumer',
              icon: 'icon-luoji',
              permissionPoints: ClustersPermissionMap.TEST_CONSUMER,
--- a/km-console/packages/layout-clusters-fe/src/index.less
+++ b/km-console/packages/layout-clusters-fe/src/index.less
@@ -259,6 +259,19 @@ li {
  }
 }

+.menu-item-with-pro-tag {
+  display: flex;
+  .pro-tag {
+    width: 24px;
+    margin-left: 4px;
+    background: no-repeat center/24px 16px url('./assets/pro-tag.png');
+  }
+}
+
+.dcloud-menu-item-selected .menu-item-with-pro-tag .pro-tag {
+  width: 0;
+}
+
 .menu-item-with-beta-tag {
  display: flex;
  .beta-tag {
--- a/km-console/packages/layout-clusters-fe/src/pages/Login/config.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/Login/config.tsx
@@ -45,6 +45,7 @@ export const FormMap = [
      prefix: <></>,
      // prefix: <UserOutlined style={{ color: 'rgba(0,0,0,.25)' }} />,
    },
+    initialValue: 'admin',
  },
  {
    key: 'pw',
@@ -64,6 +65,7 @@ export const FormMap = [
      placeholder: '请输入密码',
      // prefix: <LockOutlined style={{ color: 'rgba(0,0,0,.25)' }} />,
    },
+    initialValue: 'admin2022_',
  },
 ];

--- a/km-console/packages/layout-clusters-fe/src/pages/Login/login.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/Login/login.tsx
@@ -58,7 +58,14 @@ export const LoginForm: React.FC<any> = (props) => {
        {FormMap.map((formItem) => {
          return (
            <Row key={formItem.key}>
-              <Form.Item key={formItem.key} name={formItem.key} label={formItem.label} rules={formItem.rules} style={{ width: '100%' }}>
+              <Form.Item
+                key={formItem.key}
+                name={formItem.key}
+                label={formItem.label}
+                rules={formItem.rules}
+                initialValue={formItem.initialValue}
+                style={{ width: '100%' }}
+              >
                {renderFormItem(formItem)}
              </Form.Item>
            </Row>
--- a/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/Consume.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/Consume.tsx
@@ -144,8 +144,6 @@ const ConsumeClientTest = () => {
            ...configInfo,
            needFilterKeyValue: changeValue === 1 || changeValue === 2,
            needFilterSize: changeValue === 3 || changeValue === 4 || changeValue === 5,
-            needFilterKey: changeValue === 6,
-            needFilterValue: changeValue === 7,
          });
          break;
      }
--- a/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/config.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/config.tsx
@@ -16,19 +16,19 @@ export const cardList = [

 export const filterList = [
  {
-    label: 'None',
+    label: 'none',
    value: 0,
  },
  {
-    label: 'Contains',
+    label: 'contains',
    value: 1,
  },
  {
-    label: 'Does Not Contains',
+    label: 'does not contains',
    value: 2,
  },
  {
-    label: 'Equals',
+    label: 'equals',
    value: 3,
  },
  {
@@ -39,14 +39,6 @@ export const filterList = [
    label: 'Under Size',
    value: 5,
  },
-  {
-      label: 'Key Contains',
-      value: 6,
-  },
-  {
-      label: 'Value Contains',
-      value: 7,
-  }
 ];

 export const untilList = [
@@ -332,10 +324,10 @@ export const getFormConfig = (topicMetaData: any, info = {} as any, partitionLis
      key: 'filterKey',
      label: 'Key',
      type: FormItemType.input,
-      invisible: !info?.needFilterKeyValue && !info?.needFilterKey,
+      invisible: !info?.needFilterKeyValue,
      rules: [
        {
-          required: info?.needFilterKeyValue || info?.needFilterKey,
+          required: info?.needFilterKeyValue,
          message: '请输入Key',
        },
      ],
@@ -344,10 +336,10 @@ export const getFormConfig = (topicMetaData: any, info = {} as any, partitionLis
      key: 'filterValue',
      label: 'Value',
      type: FormItemType.input,
-      invisible: !info?.needFilterKeyValue && !info?.needFilterValue,
+      invisible: !info?.needFilterKeyValue,
      rules: [
        {
-          required: info?.needFilterKeyValue || info?.needFilterValue,
+          required: info?.needFilterKeyValue,
          message: '请输入Value',
        },
      ],
--- a/km-console/packages/layout-clusters-fe/src/pages/TopicList/ExpandPartition.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/TopicList/ExpandPartition.tsx
@@ -44,7 +44,7 @@ const ExpandPartition = (props: { record: any; onConfirm: () => void }) => {

    setLoading(true);
    const metricParams = {
-      aggType: 'sum',
+      aggType: 'avg',
      endTime: Math.round(endStamp),
      metricsNames: ['BytesIn', 'BytesOut'],
      startTime: Math.round(startStamp),
--- a/km-console/pom.xml
+++ b/km-console/pom.xml
@@ -32,6 +32,8 @@
                        <configuration>
                            <nodeVersion>v12.22.12</nodeVersion>
                            <npmVersion>6.14.16</npmVersion>
+                            <nodeDownloadRoot>https://npm.taobao.org/mirrors/node/</nodeDownloadRoot>
+                            <npmDownloadRoot>https://registry.npm.taobao.org/npm/-/</npmDownloadRoot>
                        </configuration>
                    </execution>
                    <execution>
--- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerConfigServiceImpl.java
+++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerConfigServiceImpl.java
@@ -37,7 +37,6 @@ import scala.jdk.javaapi.CollectionConverters;

 import javax.annotation.PostConstruct;
 import java.util.*;
-import java.util.stream.Collectors;

 import static com.xiaojukeji.know.streaming.km.common.enums.version.VersionEnum.*;

@@ -155,11 +154,9 @@ public class BrokerConfigServiceImpl extends BaseKafkaVersionControlService impl
        if (propertiesResult.failed()) {
            return Result.buildFromIgnoreData(propertiesResult);
        }
-        List<String> configKeyList = propertiesResult.getData().keySet().stream().map(Object::toString).collect(Collectors.toList());
-

        return Result.buildSuc(KafkaConfigConverter.convert2KafkaBrokerConfigDetailList(
-                configKeyList,
+                new ArrayList<>(),
                propertiesResult.getData()
        ));
    }
--- a/km-enterprise/km-testing/src/main/java/com/xiaojukeji/know/streaming/km/testing/biz/impl/KafkaClientTestManagerImpl.java
+++ b/km-enterprise/km-testing/src/main/java/com/xiaojukeji/know/streaming/km/testing/biz/impl/KafkaClientTestManagerImpl.java
@@ -451,18 +451,6 @@ public class KafkaClientTestManagerImpl implements KafkaClientTestManager {
            return Result.buildFromRSAndMsg(ResultStatus.PARAM_ILLEGAL, "包含的方式过滤，必须有过滤的key或value");
        }

-        // key包含过滤
-        if (KafkaConsumerFilterEnum.KEY_CONTAINS.getCode().equals(filter.getFilterType())
-            && ValidateUtils.isBlank(filter.getFilterCompareKey())) {
-            return Result.buildFromRSAndMsg(ResultStatus.PARAM_ILLEGAL, "key包含的方式过滤，必须有过滤的key");
-        }
-
-        // value包含过滤
-        if (KafkaConsumerFilterEnum.VALUE_CONTAINS.getCode().equals(filter.getFilterType())
-            && ValidateUtils.isBlank(filter.getFilterCompareValue())) {
-            return Result.buildFromRSAndMsg(ResultStatus.PARAM_ILLEGAL, "value包含的方式过滤，必须有过滤的value");
-        }
-
        // 不包含过滤
        if (KafkaConsumerFilterEnum.NOT_CONTAINS.getCode().equals(filter.getFilterType())
                && ValidateUtils.isBlank(filter.getFilterCompareKey()) && ValidateUtils.isBlank(filter.getFilterCompareValue())) {
@@ -562,18 +550,6 @@ public class KafkaClientTestManagerImpl implements KafkaClientTestManager {
            return true;
        }

-        // key包含过滤
-        if (KafkaConsumerFilterEnum.KEY_CONTAINS.getCode().equals(filter.getFilterType())
-            && (!ValidateUtils.isBlank(filter.getFilterCompareKey()) && consumerRecord.key() != null && consumerRecord.key().toString().contains(filter.getFilterCompareKey()))) {
-            return true;
-        }
-
-        // value包含过滤
-        if (KafkaConsumerFilterEnum.VALUE_CONTAINS.getCode().equals(filter.getFilterType())
-            && (!ValidateUtils.isBlank(filter.getFilterCompareValue()) && consumerRecord.value() != null && consumerRecord.value().toString().contains(filter.getFilterCompareValue()))) {
-            return true;
-        }
-
        // 不包含过滤
        if (KafkaConsumerFilterEnum.NOT_CONTAINS.getCode().equals(filter.getFilterType())
                && (!ValidateUtils.isBlank(filter.getFilterCompareKey()) && (consumerRecord.key() == null || !consumerRecord.key().toString().contains(filter.getFilterCompareKey())))
--- a/km-enterprise/km-testing/src/main/java/com/xiaojukeji/know/streaming/km/testing/common/bean/dto/KafkaConsumerFilterDTO.java
+++ b/km-enterprise/km-testing/src/main/java/com/xiaojukeji/know/streaming/km/testing/common/bean/dto/KafkaConsumerFilterDTO.java
@@ -19,7 +19,7 @@ public class KafkaConsumerFilterDTO extends BaseDTO {
    /**
     * @see KafkaConsumerFilterEnum
     */
-    @Range(min = 0, max = 7, message = "filterType最大和最小值必须在[0, 7]之间")
+    @Range(min = 0, max = 5, message = "filterType最大和最小值必须在[0, 5]之间")
    @ApiModelProperty(value = "开始消费位置的类型", example = "2")
    private Integer filterType;

--- a/km-enterprise/km-testing/src/main/java/com/xiaojukeji/know/streaming/km/testing/common/enums/KafkaConsumerFilterEnum.java
+++ b/km-enterprise/km-testing/src/main/java/com/xiaojukeji/know/streaming/km/testing/common/enums/KafkaConsumerFilterEnum.java
@@ -22,10 +22,6 @@ public enum KafkaConsumerFilterEnum {

    UNDER_SIZE(5, "size小于"),

-    KEY_CONTAINS(6, "key包含"),
-
-    VALUE_CONTAINS(7, "value包含"),
-
    ;

    private final Integer code;
--- a/km-persistence/src/main/resources/es/dsl/TopicMetricESDAO/getAggListMetrics
+++ b/km-persistence/src/main/resources/es/dsl/TopicMetricESDAO/getAggListMetrics
@@ -17,13 +17,6 @@
            }
          }
        },
-        {
-          "term": {
-            "brokerAgg" : {
-              "value": "1"
-            }
-          }
-        },
        {
          "range": {
            "timestamp": {
--- a/km-rest/pom.xml
+++ b/km-rest/pom.xml
@@ -143,12 +143,6 @@
            <version>${springboot.version}</version>
        </dependency>

-        <dependency>
-            <groupId>com.github.ulisesbocchio</groupId>
-            <artifactId>jasypt-spring-boot-starter</artifactId>
-            <version>3.0.5</version>
-        </dependency>
-
        <!--testcontainers-->
        <dependency>
            <groupId>org.testcontainers</groupId>
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
    </parent>

    <properties>
-        <revision>enterprise-3.4.0</revision>
+        <revision>demo-3.4.0</revision>

        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
Author	SHA1	Message	Date
ZQKC	a87a0663ed	版本升级至3.4.0	2023-12-03 15:24:11 +08:00
ZQKC	f5de9789f2	合并企业版分支	2023-12-03 14:40:40 +08:00
ZQKC	64cddb7912	合并Master分支	2023-07-07 13:01:27 +08:00
zengqiao	aa35965d7a	体验环境	2023-02-27 18:43:48 +08:00