Merge remote-tracking branch 'origin/fix' into main-github

eolinker · Jun 22, 2022 · 5e1b2a8 · 5e1b2a8
2 parents 0d64f7b + 02983df
commit 5e1b2a8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -53,13 +53,8 @@ professions:    # 流程阶段，下面配置中的name和profession为dashboard
   - name: services    # dashboard模块：服务
     profession: service # apinto模块：服务
     i18n_name:    # 国际化语言名称
-      zh_cn: 服务    # 中文描述
-      en_us: services    # 英文描述
-  - name: upstreams    # dashboard模块：上游
-    profession: upstream    # apinto模块：上游
-    i18n_name:
-      zh_cn: 上游
-      en_us: upstreams
+      zh_cn: 上游服务   # 中文描述
+      en_us: upstream services  # 英文描述
   - name: discoveries    # dashboard模块：服务发现
     profession: discovery    # apinto模块：服务发现
     i18n_name:

diff --git a/builds/config.yml b/builds/config.yml
@@ -8,7 +8,6 @@ user_details:
   type: file
   file: ./account.yml
 professions:
-
   - name: services
     profession: service
     i18n_name:

diff --git a/builds/resources/config.yml b/builds/resources/config.yml
@@ -12,13 +12,8 @@ professions:
   - name: services
     profession: service
     i18n_name:
-      zh_cn: 服务
-      en_us: services
-  - name: upstreams
-    profession: upstream
-    i18n_name:
-      zh_cn: 上游
-      en_us: upstreams
+      zh_cn: 上游服务
+      en_us: upstream services
   - name: discoveries
     profession: discovery
     i18n_name: