aa

drone/.drone-prod.yml

@@ -319,7 +319,7 @@ steps:
         - docker stop kxs-system && docker rm kxs-system && docker-compose up -d kxs-system
         # - docker restart nodeServer1
         - echo ====部署成功=======
-  - name: scp-project
+  - name: scp-project-b
     image: appleboy/drone-scp
     pull: if-not-exists
     depends_on: [build-project] # 依赖的步骤
@@ -346,7 +346,7 @@ steps:
         status:
           - success # 当前步骤成功时执行
 
-  - name: deploy-project
+  - name: deploy-project-b
     image: appleboy/drone-ssh
     pull: if-not-exists
     depends_on: [scp-project] # 依赖的步骤
@@ -422,6 +422,30 @@ steps:
     volumes: # 挂载数据卷
       - name: targetDir # 数据卷名称
         path: /kxs-user # 容器内目录 绝对路径
+    settings:
+      host:
+        from_secret: kxs-user-a-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-user-pwd
+      port: 22
+      command_timeout: 2m
+      target: /home/ABServer/deploy-ready/
+      source:
+        - echo ====开始拷贝=======
+        - /kxs-user/*.jar
+        - /kxs-user/lib
+        - /kxs-user/config
+        - echo ====结束拷贝=======
+      when:
+        status:
+          - success # 当前步骤成功时执行
+
+  - name: deploy-project
+    image: appleboy/drone-ssh
+    pull: if-not-exists
+    depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
         from_secret: host
@@ -431,6 +455,29 @@ steps:
         from_secret: userpwd
       port: 22
       command_timeout: 2m
+      script:
+        - echo ====开始部署=======
+        - cd /home/ABServer/
+        - cp -r /home/ABServer/deploy-ready/kxs-user /home/ABServer/webroot/
+        - docker stop kxs-user && docker rm kxs-user && docker-compose up -d kxs-user
+        # - docker restart nodeServer1
+        - echo ====部署成功=======
+  - name: scp-project-b
+    image: appleboy/drone-scp
+    pull: if-not-exists
+    depends_on: [build-project] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: targetDir # 数据卷名称
+        path: /kxs-user # 容器内目录 绝对路径
+    settings:
+      host:
+        from_secret: kxs-user-b-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-user-pwd
+      port: 22
+      command_timeout: 2m
       target: /home/ABServer/deploy-ready/
       source:
         - echo ====开始拷贝=======
@@ -442,7 +489,7 @@ steps:
         status:
           - success # 当前步骤成功时执行
 
-  - name: deploy-project
+  - name: deploy-project-b
     image: appleboy/drone-ssh
     pull: if-not-exists
     depends_on: [scp-project] # 依赖的步骤
@@ -474,7 +521,7 @@ trigger:
 ---
 kind: pipeline
 type: docker
-name: kxs-product
+name: kxs-product-prod
 
 volumes: # 声明数据卷
   - name: mvn_repo # 数据卷名称
@@ -519,11 +566,11 @@ steps:
         path: /kxs-product # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: host
+        from_secret: kxs-product-a-host
       username:
         from_secret: username
       password:
-        from_secret: userpwd
+        from_secret: kxs-product-pwd
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
@@ -543,11 +590,105 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: host
+        from_secret: kxs-product-a-host
       username:
         from_secret: username
       password:
-        from_secret: userpwd
+        from_secret: kxs-product-pwd
+      port: 22
+      command_timeout: 2m
+      script:
+        - echo ====开始部署=======
+        - cd /home/ABServer/
+        - cp -r /home/ABServer/deploy-ready/kxs-product /home/ABServer/webroot/
+        - docker stop kxs-product && docker rm kxs-product && docker-compose up -d kxs-product
+        # - docker restart nodeServer1
+        - echo ====部署成功=======
+  - name: scp-project-b
+    image: appleboy/drone-scp
+    pull: if-not-exists
+    depends_on: [build-project] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: targetDir # 数据卷名称
+        path: /kxs-product # 容器内目录 绝对路径
+    settings:
+      host:
+        from_secret: kxs-product-a-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-product-pwd
+      port: 22
+      command_timeout: 2m
+      target: /home/ABServer/deploy-ready/
+      source:
+        - echo ====开始拷贝=======
+        - /kxs-product/*.jar
+        - /kxs-product/lib
+        - /kxs-product/config
+        - echo ====结束拷贝=======
+      when:
+        status:
+          - success # 当前步骤成功时执行
+
+  - name: deploy-project-b
+    image: appleboy/drone-ssh
+    pull: if-not-exists
+    depends_on: [scp-project] # 依赖的步骤
+    settings:
+      host:
+        from_secret: kxs-product-a-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-product-pwd
+      port: 22
+      command_timeout: 2m
+      script:
+        - echo ====开始部署=======
+        - cd /home/ABServer/
+        - cp -r /home/ABServer/deploy-ready/kxs-product /home/ABServer/webroot/
+        - docker stop kxs-product && docker rm kxs-product && docker-compose up -d kxs-product
+        # - docker restart nodeServer1
+        - echo ====部署成功=======
+  - name: scp-project-b
+    image: appleboy/drone-scp
+    pull: if-not-exists
+    depends_on: [build-project] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: targetDir # 数据卷名称
+        path: /kxs-product # 容器内目录 绝对路径
+    settings:
+      host:
+        from_secret: kxs-product-b-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-product-pwd
+      port: 22
+      command_timeout: 2m
+      target: /home/ABServer/deploy-ready/
+      source:
+        - echo ====开始拷贝=======
+        - /kxs-product/*.jar
+        - /kxs-product/lib
+        - /kxs-product/config
+        - echo ====结束拷贝=======
+      when:
+        status:
+          - success # 当前步骤成功时执行
+
+  - name: deploy-project-b
+    image: appleboy/drone-ssh
+    pull: if-not-exists
+    depends_on: [scp-project] # 依赖的步骤
+    settings:
+      host:
+        from_secret: kxs-product-b-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-product-pwd
       port: 22
       command_timeout: 2m
       script:
@@ -570,7 +711,7 @@ trigger:
 ---
 kind: pipeline
 type: docker
-name: kxs-store
+name: kxs-store-prod
 
 volumes: # 声明数据卷
   - name: mvn_repo # 数据卷名称
@@ -615,11 +756,11 @@ steps:
         path: /kxs-store # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: host
+        from_secret: kxs-store-a-host
       username:
         from_secret: username
       password:
-        from_secret: userpwd
+        from_secret: kxs-store-pwd
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
@@ -639,11 +780,58 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: host
+        from_secret: kxs-store-a-host
       username:
         from_secret: username
       password:
-        from_secret: userpwd
+        from_secret: kxs-store-pwd
+      port: 22
+      command_timeout: 2m
+      script:
+        - echo ====开始部署=======
+        - cd /home/ABServer/
+        - cp -r /home/ABServer/deploy-ready/kxs-store /home/ABServer/webroot/
+        - docker stop kxs-store && docker rm kxs-store && docker-compose up -d kxs-store
+        # - docker restart nodeServer1
+        - echo ====部署成功=======
+  - name: scp-project-b
+    image: appleboy/drone-scp
+    pull: if-not-exists
+    depends_on: [build-project] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: targetDir # 数据卷名称
+        path: /kxs-store # 容器内目录 绝对路径
+    settings:
+      host:
+        from_secret: kxs-store-b-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-store-pwd
+      port: 22
+      command_timeout: 2m
+      target: /home/ABServer/deploy-ready/
+      source:
+        - echo ====开始拷贝=======
+        - /kxs-store/*.jar
+        - /kxs-store/lib
+        - /kxs-store/config
+        - echo ====结束拷贝=======
+      when:
+        status:
+          - success # 当前步骤成功时执行
+
+  - name: deploy-project-b
+    image: appleboy/drone-ssh
+    pull: if-not-exists
+    depends_on: [scp-project] # 依赖的步骤
+    settings:
+      host:
+        from_secret: kxs-store-b-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-store-pwd
       port: 22
       command_timeout: 2m
       script:

kxs-gateway/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ spring:
 #      username: @nacos.username@
 #      password: @nacos.password@
       discovery:
-        server-addr: ${NACOS_HOST:mse-78d0edb13-nacos-ans.mse.aliyuncs.com}:${NACOS_PORT:9848}
+        server-addr: ${NACOS_HOST:mse-78d0edb13-nacos-ans.mse.aliyuncs.com}:${NACOS_PORT:8848}
         watch:
           enabled: true
         watch-delay: 1000