Merge branch 'yjzx_test' of http://1.95.78.131:8090/ZhangJingKun/think-tank into yjzx_test

build/Dockerfile

@@ -17,14 +17,17 @@ WORKDIR /workspace
 COPY --from=builder /workspace/target/*.jar /workspace/app.jar
 
 ARG ENV_NAME
+ARG NACOS
 ARG PORT
 
 ENV APP_OPTS1="-Dspring.profiles.active=${ENV_NAME}"
 ENV APP_OPTS2="-Djasypt.encryptor.password=1@wdLkj90#chMsdzxA%2024"
 ENV APP_OPTS3="-Dfile.encoding=utf-8"
 ENV APP_OPTS4="-Duser.timezone=Asia/Shanghai"
+ENV APP_OPTS5="${NACOS}"
 ENV JVM_OPTS="-Xmx2024M -Xms256M"
 
+
 EXPOSE ${PORT}
 
-ENTRYPOINT ["sh","-c","java $APP_OPTS1 $APP_OPTS2 $APP_OPTS3 $APP_OPTS4 -jar $JVM_OPTS /workspace/app.jar"]
+ENTRYPOINT ["sh","-c","java $APP_OPTS1 $APP_OPTS2 $APP_OPTS3 $APP_OPTS4 APP_OPTS5 -jar $JVM_OPTS /workspace/app.jar"]
\ No newline at end of file

build/build.sh

@@ -44,7 +44,7 @@ function handle {
   echo "完整镜像: ${domain}/${namespace}/${name}:${version}"
 
   echo "---构建镜像---"
-  docker build --build-arg ENV_NAME=${svc_env} --build-arg PORT=${svc_port} -f ./build/Dockerfile -t ${domain}/${namespace}/${name}:${version} .
+  docker build --build-arg NACOS=${svc_nacos} --build-arg ENV_NAME=${svc_env} --build-arg PORT=${svc_port} -f ./build/Dockerfile -t ${domain}/${namespace}/${name}:${version} .
 
   echo "---推送镜像---"
   docker login -u=$username -p=${passwd} ${domain}

build/env/env.prod

 # 镜像仓库
 # 版本 T1.0.0: T为测试版，R为稳定版
-version="R1.0.0" # 可自定义
+version="T1.0.0" # 可自定义
 # 镜像仓库地址
 domain="swr.cn-southwest-2.myhuaweicloud.com"
 # 镜像分组，按部门区分
@@ -17,3 +17,5 @@ svc_env="prod"
 svc_name="think-tank"
 # 服务端口
 svc_port="9098"
+# nacos配置
+svc_nacos="-DNACOS_SERVER=192.168.0.249:9848 -DNACOS_NAMESPACE=smartTest"

build/env/env.test

@@ -17,3 +17,5 @@ svc_env="test"
 svc_name="think-tank"
 # 服务端口
 svc_port="9099"
+# nacos配置
+svc_nacos="-DNACOS_SERVER=192.168.0.249:9848 -DNACOS_NAMESPACE=smartTest"