From 7138d65f78cd08f67d50bfc4875fc22182b89891 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Sat, 11 Dec 2021 13:59:55 +0800
Subject: [PATCH] update docker-compose.yml

---
 apps/vue/docker-compose.yml                   |  9 ++--
 .../SettingManagement/src/SettingForm.vue     |  7 ++-
 docker-compose.override.yml                   | 49 ++++++++++++-------
 docker-compose.yml                            | 14 +++---
 4 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/apps/vue/docker-compose.yml b/apps/vue/docker-compose.yml
index f78e7666d..8ab0c9e19 100644
--- a/apps/vue/docker-compose.yml
+++ b/apps/vue/docker-compose.yml
@@ -7,9 +7,10 @@ services:
     restart: always
     ports:
       - "40080:80"
-
-volumes:
-  dbdata:
+    networks:
+      - framework
 
 networks:
-  linyun-abp:
+  framework:
+    external:
+      name: ly_app_net
diff --git a/apps/vue/src/components/SettingManagement/src/SettingForm.vue b/apps/vue/src/components/SettingManagement/src/SettingForm.vue
index 2776c5e9e..615f40ae4 100644
--- a/apps/vue/src/components/SettingManagement/src/SettingForm.vue
+++ b/apps/vue/src/components/SettingManagement/src/SettingForm.vue
@@ -2,7 +2,7 @@
   <Form :label-col="{ span: 5 }" :wrapper-col="{ span: 15 }">
     <Row type="flex">
       <Col :span="24">
-        <Tabs v-model:activeKey="activeTabKey">
+        <Tabs v-model:activeKey="activeTabKey" :tab-position="tabPosition">
           <TabPane
             v-for="(group, tabIndex) in settingGroups"
             :key="tabIndex"
@@ -108,7 +108,10 @@
       type: Function as PropType<(...args: any) => Promise<any>>,
       required: true,
     },
-    tabPosition: { type: String },
+    tabPosition: {
+      type: String,
+      defaultValue: 'top',
+    },
   } as const; // 对于存在必输项的props see: https://blog.csdn.net/q535999731/article/details/109578885
 
   export default defineComponent({
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index e62240780..04a5d8a8c 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,43 +1,53 @@
 version: '3.4'
 
 services:
-  identity-server-sts:
+  sts-server:
     build:
       context: ./aspnet-core/services/Publish/identityserver
     volumes:
       - /var/opt/abp/logs/ids-sts:/app/Logs
       - /var/opt/abp/data/ids-sts/Modules:/app/Modules
     restart: always
+    networks:
+      - framework
 
-  identity-server-admin:
+  sts-api:
     build:
       context: ./aspnet-core/services/Publish/identityserver4-admin
     volumes:
       - /var/opt/abp/logs/ids-admin:/app/Logs
       - /var/opt/abp/data/ids-admin/Modules:/app/Modules
     depends_on:
-      - identity-server-sts
+      - sts-server
     restart: always
+    networks:
+      - framework
 
-  admin-service:
+  admin-api:
     build:
       context: ./aspnet-core/services/Publish/admin
     volumes:
       - /var/opt/abp/logs/backend-admin:/app/Logs
       - /var/opt/abp/data/backend-admin/Modules:/app/Modules
     depends_on:
-      - identity-server-sts
+      - sts-server
     restart: always
+    networks:
+      - framework
 
-  localization-service:
+  localization-api:
     build:
       context: ./aspnet-core/services/Publish/localization
     volumes:
       - /var/opt/abp/logs/localization:/app/Logs
       - /var/opt/abp/data/localization/Modules:/app/Modules
     restart: always
+    depends_on:
+      - sts-server
+    networks:
+      - framework
 
-  platform-service:
+  platform-api:
     build:
       context: ./aspnet-core/services/Publish/platform
     volumes:
@@ -45,29 +55,34 @@ services:
       - /var/opt/abp/data/platform/Modules:/app/Modules
       - /var/opt/abp/data/platform:/app/file-blob-storing
     depends_on:
-      - identity-server-sts
+      - sts-server
     restart: always
+    networks:
+      - framework
 
-  messages-service:
+  messages-api:
     build:
       context: ./aspnet-core/services/Publish/messages
     volumes:
       - /var/opt/abp/logs/messages:/app/Logs
       - /var/opt/abp/data/messages/Modules:/app/Modules
     depends_on:
-      - identity-server-sts
+      - sts-server
     restart: always
+    networks:
+      - framework
 
-  internat-apigateway:
+  internal-apigateway:
     build:
       context: ./aspnet-core/services/Publish/internal-apigateway
     volumes:
-      - /var/opt/abp/logs/internat-apigateway:/app/Logs
-      - /var/opt/abp/data/internat-apigateway/Modules:/app/Modules
+      - /var/opt/abp/logs/internal-apigateway:/app/Logs
+      - /var/opt/abp/data/internal-apigateway/Modules:/app/Modules
     restart: always
-
-volumes:
-  dbdata:
+    networks:
+      - framework
 
 networks:
-  linyun-abp:
+  framework:
+    external:
+      name: ly_app_net
diff --git a/docker-compose.yml b/docker-compose.yml
index 5e0eb6a42..d09c9c101 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,49 +1,49 @@
 version: '3.4'
 
 services:
-  admin-service:
+  admin-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "30010:80"
 
-  identity-server-admin:
+  sts-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "30015:80"
 
-  localization-service:
+  localization-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "30030:80"
 
-  platform-service:
+  platform-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "30025:80"
 
-  messages-service:
+  messages-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "30020:80"
 
-  identity-server-sts:
+  sts-server:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "44385:80"
 
-  internat-apigateway:
+  internal-apigateway:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80