Feat/0.2.2.6 (#348)

0.2.2.6 发布release
dataelement · Feb 23, 2024 · e5f255c · e5f255c
2 parents 94e8b03 + eb791a6
commit e5f255c
Show file tree

Hide file tree

Showing 21 changed files with 3,046 additions and 3,163 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -133,7 +133,7 @@ jobs:
         run: |
           message=""
           IFS=$'\n'
-          for line in $(echo "${{ steps.git_message.outputs.message }}"); do
+          for line in $(echo "${{ github.event.head_commit.message }}"); do
             message+="$line\n"
           done
           echo "::set-output name=message::$message"

diff --git a/docker/bisheng/config/config.yaml b/docker/bisheng/config/config.yaml
@@ -1,22 +1,24 @@
-# 数据库配置
+# 数据库配置， 当前加密串的密码是1234，
+# 密码加密参考 https://dataelem.feishu.cn/wiki/BSCcwKd4Yiot3IkOEC8cxGW7nPc#Gxitd1xEeof1TzxdhINcGS6JnXd
 database_url:
   "mysql+pymysql://root:gAAAAABlp4b4c59FeVGF_OQRVf6NOUIGdxq8246EBD-b0hdK_jVKRs1x4PoAn0A6C5S6IiFKmWn0Nm5eBUWu-7jxcqw6TiVjQA==@mysql:3306/bisheng?charset=utf8mb4"
 
 # 缓存配置  redis://[[username]:[password]]@localhost:6379/0
 # 普通模式:
-#redis_url: "redis://redis:6379/1"
-# 集群模式:
-redis_url: 
-  mode: "cluster"
-  startup_nodes: 
-    - {"host": "192.168.106.115", "port": 6002}
-  # password: encrypt(gAAAAABlp4b4c59FeVGF_OQRVf6NOUIGdxq8246EBD-b0hdK_jVKRs1x4PoAn0A6C5S6IiFKmWn0Nm5eBUWu-7jxcqw6TiVjQA==)
-  # #sentinel
-  # mode: "sentinel"
-  # sentinel_hosts: [("redis", 6379)]
-  # sentinel_master: "mymaster"
-  # sentinel_password: encrypt(gAAAAABlp4b4c59FeVGF_OQRVf6NOUIGdxq8246EBD-b0hdK_jVKRs1x4PoAn0A6C5S6IiFKmWn0Nm5eBUWu-7jxcqw6TiVjQA==)
-  # db: 1
+redis_url: "redis://redis:6379/1"
+
+# 集群模式或者哨兵模式（只能选其一）:
+# redis_url: 
+#   mode: "cluster"
+#   startup_nodes: 
+#     - {"host": "192.168.106.115", "port": 6002}
+#   password: encrypt(gAAAAABlp4b4c59FeVGF_OQRVf6NOUIGdxq8246EBD-b0hdK_jVKRs1x4PoAn0A6C5S6IiFKmWn0Nm5eBUWu-7jxcqw6TiVjQA==)
+#   #sentinel
+#   mode: "sentinel"
+#   sentinel_hosts: [("redis", 6379)]
+#   sentinel_master: "mymaster"
+#   sentinel_password: encrypt(gAAAAABlp4b4c59FeVGF_OQRVf6NOUIGdxq8246EBD-b0hdK_jVKRs1x4PoAn0A6C5S6IiFKmWn0Nm5eBUWu-7jxcqw6TiVjQA==)
+#   db: 1
 
 environment:
   env: dev

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -144,28 +144,28 @@ services:
       timeout: 20s
       retries: 3
 
-  # milvus:
-  #   container_name: milvus-standalone
-  #   image: milvusdb/milvus:v2.3.3
-  #   command: ["milvus", "run", "standalone"]
-  #   security_opt:
-  #   - seccomp:unconfined
-  #   environment:
-  #     ETCD_ENDPOINTS: etcd:2379
-  #     MINIO_ADDRESS: minio:9000
-  #   volumes:
-  #     - /etc/localtime:/etc/localtime:ro
-  #     - ${DOCKER_VOLUME_DIRECTORY:-.}/data/milvus:/var/lib/milvus
-  #   restart: on-failure
-  #   healthcheck:
-  #     test: ["CMD", "curl", "-f", "http://localhost:9091/healthz"]
-  #     start_period: 90s
-  #     interval: 30s
-  #     timeout: 20s
-  #     retries: 3
-  #   ports:
-  #     - "19530:19530"
-  #     - "9091:9091"
-  #   depends_on:
-  #     - etcd
-  #     - minio
+  milvus:
+    container_name: milvus-standalone
+    image: milvusdb/milvus:v2.3.3
+    command: ["milvus", "run", "standalone"]
+    security_opt:
+    - seccomp:unconfined
+    environment:
+      ETCD_ENDPOINTS: etcd:2379
+      MINIO_ADDRESS: minio:9000
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - ${DOCKER_VOLUME_DIRECTORY:-.}/data/milvus:/var/lib/milvus
+    restart: on-failure
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9091/healthz"]
+      start_period: 90s
+      interval: 30s
+      timeout: 20s
+      retries: 3
+    ports:
+      - "19530:19530"
+      - "9091:9091"
+    depends_on:
+      - etcd
+      - minio