Skip to content

Commit

Permalink
Merge pull request #34 from WeBankFinTech/master
Browse files Browse the repository at this point in the history
Merge change from master branch to develop branch
  • Loading branch information
keranbingaa authored Jul 28, 2021
2 parents 23eecf7 + a8512db commit 3dc78db
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 3 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/gitee-mirror.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# 使用 GitHub Action 来解决手动同步到 Gitee 的问题
# 效果:github repo 代码更新之后,会自动同步至 gitee
# 使用到的 GitHub Action:https://github.com/Yikun/hub-mirror-action

# This is a basic workflow to help you get started with Actions

name: Gitee Mirror

# Controls when the action will run. Triggers the workflow on push or pull request
# events for all branches
on:
push:
branches:
- '*'

jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Mirror the Github organization repos to Gitee.
uses: Yikun/hub-mirror-action@master
with:
src: github/WeBankFinTech
dst: gitee/webank
# 这里请填写与gitee上公钥匹配的的 ssh private key,参见:https://gitee.com/profile/sshkeys
# 填写地址:https://github.com/WeBankFinTech/fes.js/settings/secrets
dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
# 这里请填写 gitee的令牌,参见:https://gitee.com/profile/personal_access_tokens
# 填写地址:https://github.com/WeBankFinTech/fes.js/settings/secrets
dst_token: ${{ secrets.GITEE_TOKEN }}
# 项目同步白名单,可以选择填写多个,以英文逗号分割
static_list: "DeFiBus"
# 是否强制同步
force_update: true
# 账号类型:对 luban-h5 而言是 user,因为是个人项目;如果是企业项目,请填写 org,因为是组织下的项目
account_type: org
clone_style: ssh
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
![architecture1](./docs/images/dist-arch.png)

名词解释
DCN:Data Center Node(数据中心节点
DCN:Data Center Node(数据中心单元化节点

### 系统架构
![architecture2](./docs/images/defibus-arch.png)
Expand All @@ -21,7 +21,7 @@ DeFiBus主要包括以下几个组件(模块):

* **GSL**:全局服务定位(Global Service Location)服务提供服务级别的路由发现。服务可以部署在不同的区域(比如不同的数据中心、逻辑分区等),服务请求方在请求某一个具体服务时,无需关注服务部署的区域,GSL能够根据服务发现规则自动定位到具体的服务,将服务信息返回给客户端。

* **[EventMesh](https://github.com/WeBankFinTech/EventMesh)**:服务代理提供TCP/HTTP接入方式,同时允许按照协议规范开发的C、GO、Python等其他语言客户端的接入。
* **[EventMesh](https://github.com/apache/incubator-eventmesh)**:服务代理提供TCP/HTTP接入方式,同时允许按照协议规范开发的C、GO、Python等其他语言客户端的接入。

* **ConfigCenter(CC)**:配置中心,提供HTTP接入方式,比如Namesrv的寻址以及其他配置。

Expand All @@ -40,7 +40,7 @@ DeFiBus主要包括以下几个组件(模块):
* [应用多活:应用多中心多活](docs/cn/features/5-multi-active.md)
* [动态扩缩队列 :自适应应用实例数量,动态调整队列个数](docs/cn/features/6-dynamic-adjust-queue.md)
* [容错机制:故障和错误隔离](docs/cn/features/8-fault-tolerant.md)
* [服务代理:云原生多语言的代理EventMesh](https://github.com/WeBankFinTech/EventMesh)
* [服务代理:云原生多语言的代理EventMesh](https://github.com/apache/incubator-eventmesh)
* 服务治理:服务元数据的管理(待开源)
* 服务路由和定位:动态路由及定位(待开源)
* 平滑升级:平滑升级、平滑扩容(待开源)
Expand Down
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-cayman
Binary file modified docs/images/dist-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/wechat_helper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3dc78db

Please sign in to comment.