From fb683d72ad4a275709d5f6d74d7c6095e6bdeb40 Mon Sep 17 00:00:00 2001
From: otto <731554297@qq.com>
Date: Fri, 5 May 2023 09:45:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E9=83=A8=E7=BD=B2):=20?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增测试环境及生产环境
修复nacos映射端口参数重复的问题

关联Issue:https://www.gitlink.org.cn/Gitlink/forgeplus/issues/2853
---
 docker-gitlink/build.sh                   | 8 ++++----
 docker-gitlink/default_docker-compose.yml | 6 +++---
 docker-gitlink/deploy.sh                  | 2 +-
 docker-gitlink/prod_config.profile        | 6 +++---
 docker-gitlink/test_config.profile        | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docker-gitlink/build.sh b/docker-gitlink/build.sh
index 0e6729a05..a5038429d 100755
--- a/docker-gitlink/build.sh
+++ b/docker-gitlink/build.sh
@@ -6,7 +6,7 @@ orgin_path=`pwd`
 
 # 使用说明，用来提示输入参数
 usage() {
-  echo "\e[91m错误：必须传入环境和方法两个参数 \e[0m"
+  echo -e "\e[91m错误：必须传入环境和方法两个参数 \e[0m"
 	echo "Usage: sh build.sh [test|prod] [build_base_image|gen_nacos_config|gen_nacos_sql|gen_docker_compose|gen_dockerfile|build_maven]"
 	exit 1
 }
@@ -66,9 +66,9 @@ gen_docker_compose(){
   cp default_docker-compose.yml docker-compose.yml
   sed -i "s|#docker_data|${docker_data}|g" docker-compose.yml
   sed -i "s|#file_path|${file_path}|g" docker-compose.yml
-  sed -i "s|#nacos_port|${nacos_port}|g" docker-compose.yml
-  sed -i "s|#redis_port|${redis_port}|g" docker-compose.yml
-  sed -i "s|#gateway_port|${gateway_port}|g" docker-compose.yml
+  sed -i "s|#mapping_nacos_port|${mapping_nacos_port}|g" docker-compose.yml
+  sed -i "s|#mapping_redis_port|${mapping_redis_port}|g" docker-compose.yml
+  sed -i "s|#mapping_gateway_port|${mapping_gateway_port}|g" docker-compose.yml
 }
 
 gen_dockerfile(){
diff --git a/docker-gitlink/default_docker-compose.yml b/docker-gitlink/default_docker-compose.yml
index c27a7753f..e124ed8c3 100644
--- a/docker-gitlink/default_docker-compose.yml
+++ b/docker-gitlink/default_docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - #docker_data/nacos/logs/:/home/nacos/logs
       - #docker_data/nacos/conf/application.properties:/home/nacos/conf/application.properties
     ports:
-          - "#nacos_port:8848"
+          - "#mapping_nacos_port:8848"
     deploy:
       resources:
         limits:
@@ -22,7 +22,7 @@ services:
     build:
       context: ./redis
     ports:
-      - "#redis_port:6379"
+      - "#mapping_redis_port:6379"
     volumes:
       - #docker_data/redis/conf/redis.conf:/home/gitlink/redis/redis.conf
       - #docker_data/redis/data:/data
@@ -57,7 +57,7 @@ services:
       context: gitlink/gateway
       dockerfile: dockerfile
     ports:
-      - "#gateway_port:8080"
+      - "#mapping_gateway_port:8080"
     depends_on:
       - gitlink-redis
       - gitlink-nacos
diff --git a/docker-gitlink/deploy.sh b/docker-gitlink/deploy.sh
index da4a1f1bd..793a4976a 100755
--- a/docker-gitlink/deploy.sh
+++ b/docker-gitlink/deploy.sh
@@ -2,7 +2,7 @@
 
 # 使用说明，用来提示输入参数
 usage() {
-  echo "\e[91m错误：必须传入环境和方法两个参数 \e[0m"
+  echo -e "\e[91m错误：必须传入环境和方法两个参数 \e[0m"
 	echo "Usage: sh deploy.sh [test|prod] [port|base|build_modules|modules|stop|rm]"
 	exit 1
 }
diff --git a/docker-gitlink/prod_config.profile b/docker-gitlink/prod_config.profile
index ab8daa47c..59167e4fc 100644
--- a/docker-gitlink/prod_config.profile
+++ b/docker-gitlink/prod_config.profile
@@ -39,8 +39,8 @@ skywalking_backend_service=111.8.36.180:95
 ## Docker数据路径
 docker_data=/data/docker-data
 ## Nacos映射端口
-nacos_port=8848
+mapping_nacos_port=8848
 ## Redis映射端口
-redis_port=6379
+mapping_redis_port=6379
 ## Gateway映射端口
-gateway_port=8080
+mapping_gateway_port=8080
diff --git a/docker-gitlink/test_config.profile b/docker-gitlink/test_config.profile
index 5657b8a9e..635ea7e55 100644
--- a/docker-gitlink/test_config.profile
+++ b/docker-gitlink/test_config.profile
@@ -39,8 +39,8 @@ skywalking_backend_service=111.8.36.180:95
 ## Docker数据路径
 docker_data=/data/docker-data/test
 ## Nacos映射端口
-nacos_port=23848
+mapping_nacos_port=23848
 ## Redis映射端口
-redis_port=23379
+mapping_redis_port=23379
 ## Gateway映射端口
-gateway_port=23080
+mapping_gateway_port=23080