产品模块上线

.drone.yml

@@ -1039,7 +1039,7 @@ steps:
       password:
         from_secret: kxs-user-system-pwd
       port: 22
-      command_timeout: 2m
+      command_timeout: 5m
       script:
         - echo ====开始部署=======
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-user-biz&ip=172.27.251.56&port=8888&weight=0'
@@ -1108,6 +1108,311 @@ trigger:
   branch:
     include:
       - release-user
+  event:
+    include:
+      - pull_request
+      - push
+
+---
+kind: pipeline
+type: docker
+name: kxs-product-prod
+
+volumes: # 声明数据卷
+  - name: mvn_repo # 数据卷名称
+    # Host Volume, 挂载到宿主机上的卷轴
+    host:
+      # 宿主机的绝对路径
+      path: /home/ABServer/cache/mvn_repo
+  - name: mvn_config
+    host:
+      path: /home/ABServer/config/mvn/
+  - name: targetDir
+    host:
+      path: /kxs-product
+
+clone:
+  disable: false # 启用代码拉取
+
+steps:
+  - name: build-project
+    image: maven:3.9.4-amazoncorretto-17
+    pull: if-not-exists
+    depends_on: [clone] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: mvn_repo # 数据卷名称
+        path: /usr/share/maven/repo # 容器内目录 绝对路径
+      - name: targetDir
+        path: /drone/src/dist/
+      - name: mvn_config
+        path: /usr/share/maven/conf/
+    commands: # 执行命令
+      - mvn clean package -Dmaven.test.skip=true -P prod
+      - cp /drone/src/kxs-product/kxs-product-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-product/kxs-product-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-product/kxs-product-biz/target/config /drone/src/dist/ # 复制文件
+    when:
+      status:
+        - success # 当前步骤成功时执行
+  - name: scp-project
+    image: appleboy/drone-scp
+    pull: if-not-exists
+    depends_on: [build-project] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: targetDir # 数据卷名称
+        path: /kxs-product # 容器内目录 绝对路径
+    settings:
+      host:
+        from_secret: kxs-user-system-a-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-user-system-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
+    image: appleboy/drone-ssh
+    pull: if-not-exists
+    depends_on: [scp-project] # 依赖的步骤
+    settings:
+      host:
+        from_secret: kxs-user-system-a-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-user-system-pwd
+      port: 22
+      command_timeout: 5m
+      script:
+        - echo ====开始部署=======
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.27.251.56&port=8050&weight=0'
+        - sleep 25s
+        - 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-user-system-a-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-user-system-pwd
+      port: 22
+      command_timeout: 5m
+      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-user-system-a-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-user-system-pwd
+      port: 22
+      command_timeout: 5m
+      script:
+        - echo ====开始部署=======
+        - sleep 60s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.27.251.56&port=8050&weight=1'
+        - sleep 1s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.26.230.195&port=8050&weight=0'
+        - sleep 25s
+        - 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
+        - sleep 60s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.26.230.195&port=8050&weight=1'
+        # - docker restart nodeServer1
+        - echo ====部署成功=======
+
+trigger:
+  branch:
+    include:
+      - release-product
+  event:
+    include:
+      - pull_request
+      - push
+
+---
+kind: pipeline
+type: docker
+name: kxs-store-prod
+
+volumes: # 声明数据卷
+  - name: mvn_repo # 数据卷名称
+    # Host Volume, 挂载到宿主机上的卷轴
+    host:
+      # 宿主机的绝对路径
+      path: /home/ABServer/cache/mvn_repo
+  - name: mvn_config
+    host:
+      path: /home/ABServer/config/mvn/
+  - name: targetDir
+    host:
+      path: /kxs-store
+
+clone:
+  disable: false # 启用代码拉取
+
+steps:
+  - name: build-project
+    image: maven:3.9.4-amazoncorretto-17
+    pull: if-not-exists
+    depends_on: [clone] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: mvn_repo # 数据卷名称
+        path: /usr/share/maven/repo # 容器内目录 绝对路径
+      - name: targetDir
+        path: /drone/src/dist/
+      - name: mvn_config
+        path: /usr/share/maven/conf/
+    commands: # 执行命令
+      - mvn clean package -Dmaven.test.skip=true -P prod
+      - cp /drone/src/kxs-store/kxs-store-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-store/kxs-store-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-store/kxs-store-biz/target/config /drone/src/dist/ # 复制文件
+    when:
+      status:
+        - success # 当前步骤成功时执行
+  - name: scp-project
+    image: appleboy/drone-scp
+    pull: if-not-exists
+    depends_on: [build-project] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: targetDir # 数据卷名称
+        path: /kxs-store # 容器内目录 绝对路径
+    settings:
+      host:
+        from_secret: kxs-user-system-b-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-user-system-pwd
+      port: 22
+      command_timeout: 5m
+      target: /home/ABServer/deploy-ready/
+      source:
+        - echo ====开始拷贝=======
+        - /kxs-store/*.jar
+        - /kxs-store/lib
+        - /kxs-store/config
+        - echo ====结束拷贝=======
+      when:
+        status:
+          - success # 当前步骤成功时执行
+
+  - name: deploy-project
+    image: appleboy/drone-ssh
+    pull: if-not-exists
+    depends_on: [scp-project] # 依赖的步骤
+    settings:
+      host:
+        from_secret: kxs-user-system-b-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-user-system-pwd
+      port: 22
+      command_timeout: 5m
+      script:
+        - echo ====开始部署=======
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.27.251.56&port=8070&weight=0'
+        - sleep 25s
+        - 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-user-system-b-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-user-system-pwd
+      port: 22
+      command_timeout: 5m
+      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-user-system-b-host
+      username:
+        from_secret: username
+      password:
+        from_secret: kxs-user-system-pwd
+      port: 22
+      command_timeout: 5m
+      script:
+        - echo ====开始部署=======
+        - sleep 60s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.27.251.56&port=8070&weight=1'
+        - sleep 1s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.26.230.195&port=8070&weight=0'
+        - sleep 25s
+        - 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
+        - sleep 60s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.26.230.195&port=8070&weight=1'
+
+        # - docker restart nodeServer1
+        - echo ====部署成功=======
+
+trigger:
+  branch:
+    include:
+      - release-store
   event:
     include:
       - pull_request

drone/.drone-prod.yml

@@ -566,11 +566,11 @@ steps:
         path: /kxs-product # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: kxs-product-a-host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-product-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
@@ -590,62 +590,17 @@ steps:
     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-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
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-product-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
-      command_timeout: 2m
+      command_timeout: 5m
       script:
         - echo ====开始部署=======
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.27.251.56&port=8050&weight=0'
+        - sleep 25s
         - 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
@@ -660,13 +615,13 @@ steps:
         path: /kxs-product # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: kxs-product-b-host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-product-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
-      command_timeout: 2m
+      command_timeout: 5m
       target: /home/ABServer/deploy-ready/
       source:
         - echo ====开始拷贝=======
@@ -684,18 +639,25 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: kxs-product-b-host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-product-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
-      command_timeout: 2m
+      command_timeout: 5m
       script:
         - echo ====开始部署=======
+        - sleep 60s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.27.251.56&port=8050&weight=1'
+        - sleep 1s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.26.230.195&port=8050&weight=0'
+        - sleep 25s
         - 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
+        - sleep 60s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.26.230.195&port=8050&weight=1'
         # - docker restart nodeServer1
         - echo ====部署成功=======
 
@@ -756,13 +718,13 @@ steps:
         path: /kxs-store # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: kxs-store-a-host
+        from_secret: kxs-user-system-b-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-store-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
-      command_timeout: 2m
+      command_timeout: 5m
       target: /home/ABServer/deploy-ready/
       source:
         - echo ====开始拷贝=======
@@ -780,15 +742,17 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: kxs-store-a-host
+        from_secret: kxs-user-system-b-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-store-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
-      command_timeout: 2m
+      command_timeout: 5m
       script:
         - echo ====开始部署=======
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.27.251.56&port=8070&weight=0'
+        - sleep 25s
         - 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
@@ -803,13 +767,13 @@ steps:
         path: /kxs-store # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: kxs-store-b-host
+        from_secret: kxs-user-system-b-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-store-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
-      command_timeout: 2m
+      command_timeout: 5m
       target: /home/ABServer/deploy-ready/
       source:
         - echo ====开始拷贝=======
@@ -827,18 +791,26 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: kxs-store-b-host
+        from_secret: kxs-user-system-b-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-store-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
-      command_timeout: 2m
+      command_timeout: 5m
       script:
         - echo ====开始部署=======
+        - sleep 60s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.27.251.56&port=8070&weight=1'
+        - sleep 1s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.26.230.195&port=8070&weight=0'
+        - sleep 25s
         - 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
+        - sleep 60s
+        - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.26.230.195&port=8070&weight=1'
+
         # - docker restart nodeServer1
         - echo ====部署成功=======