From 19c6fec3dcd593a0444d2118f9b6138a598dbca1 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 30 Oct 2024 13:08:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?vue=E5=92=8Cjava=E5=90=8C=E6=97=B6=E6=9E=84?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml => .drone-all.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .drone.yml => .drone-all.yml (100%) diff --git a/.drone.yml b/.drone-all.yml similarity index 100% rename from .drone.yml rename to .drone-all.yml From 4fc63dc3262668924b4e95c3658caa52e610d4b3 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 30 Oct 2024 13:09:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9E=84=E5=BB=BAjava?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-java.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .drone-java.yml diff --git a/.drone-java.yml b/.drone-java.yml new file mode 100644 index 0000000..693d18e --- /dev/null +++ b/.drone-java.yml @@ -0,0 +1,37 @@ +kind: pipeline # 定义对象类型，还有secret和signature两种类型 + +type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型 + +name: filesystem-drone # 定义流水线名称 + +clone: + disable: true +steps: # 定义流水线执行步骤，这些步骤将顺序执行 + + image: appleboy/drone-ssh # SSH工具镜像 + + settings: + + host: 1.14.205.126 # 远程连接地址 + + username: root # 远程连接账号 + + password: + + from_secret: ssh_password # 从Secret中读取SSH密码 + + port: 22 # 远程连接端口 + + command_timeout: 30m # 远程执行命令超时时间 + + script: + - echo "build-java......" + - cd /root/allLikeMall + - git fetch origin + - git reset --hard origin/master + - git clean -fd + - /root/apache-maven-3.9.4/bin/mvn package -Dmaven.test.skip=true + - cd yudao-server + - chmod +x all.sh + - ./all.sh + From 9fd3f4b7e2eaab33df356a37b50c658309130dec Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 30 Oct 2024 13:09:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9E=84=E5=BB=BAvue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-vue.yml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .drone-vue.yml diff --git a/.drone-vue.yml b/.drone-vue.yml new file mode 100644 index 0000000..85d5c96 --- /dev/null +++ b/.drone-vue.yml @@ -0,0 +1,57 @@ +kind: pipeline # 定义对象类型，还有secret和signature两种类型 + +type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型 + +name: filesystem-drone # 定义流水线名称 + +clone: + disable: true +steps: # 定义流水线执行步骤，这些步骤将顺序执行 + + - name: build-copy-vue + + image: appleboy/drone-ssh # SSH工具镜像 + + settings: + + host: 101.43.112.107 # 远程连接地址 + + username: root # 远程连接账号 + + password: + + from_secret: ssh_password + + port: 22 # 远程连接端口 + command_timeout: 20m # 远程执行命令超时时间 + + script: + - ssh root@47.118.40.3 "sh -c 'cd /build_project/allLikeMall/yudao-admin-vue3 && git pull origin master && /usr/bin/pnpm install && /usr/bin/pnpm run build:prod && zip -r dist-prod.zip dist-prod'" + - scp root@47.118.40.3:/build_project/allLikeMall/yudao-admin-vue3/dist-prod.zip /build_package/ + - scp /build_package/dist-prod.zip root@1.14.205.126:/build_package/ + - name: build-java-and-vue + + image: appleboy/drone-ssh # SSH工具镜像 + + settings: + + host: 1.14.205.126 # 远程连接地址 + + username: root # 远程连接账号 + + password: + + from_secret: ssh_password # 从Secret中读取SSH密码 + + port: 22 # 远程连接端口 + + command_timeout: 30m # 远程执行命令超时时间 + + script: + - echo "build-vue......" + - cd /build_package + - rm -rf dist-prod + - unzip dist-prod.zip + - rm -rf /root/nginx/html/mall + - mv dist-prod /root/nginx/html/mall + From fb40e7fb15e237e9c7fb6a46d31ef9e1cc1a82b4 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 30 Oct 2024 14:01:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9E=84=E5=BB=BAvue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-vue.yml | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/.drone-vue.yml b/.drone-vue.yml index 85d5c96..ef287cd 100644 --- a/.drone-vue.yml +++ b/.drone-vue.yml @@ -1,9 +1,9 @@ kind: pipeline # 定义对象类型，还有secret和signature两种类型 - + type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型 - + name: filesystem-drone # 定义流水线名称 - + clone: disable: true steps: # 定义流水线执行步骤，这些步骤将顺序执行 @@ -26,32 +26,31 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 command_timeout: 20m # 远程执行命令超时时间 script: - - ssh root@47.118.40.3 "sh -c 'cd /build_project/allLikeMall/yudao-admin-vue3 && git pull origin master && /usr/bin/pnpm install && /usr/bin/pnpm run build:prod && zip -r dist-prod.zip dist-prod'" - - scp root@47.118.40.3:/build_project/allLikeMall/yudao-admin-vue3/dist-prod.zip /build_package/ - - scp /build_package/dist-prod.zip root@1.14.205.126:/build_package/ - - name: build-java-and-vue - + - ssh root@47.118.40.3 "sh -c 'cd /build_project/ludu-admin-vue3 && git pull origin master && /usr/bin/pnpm install && /usr/bin/pnpm run build:prod && zip -r pc.zip pc'" + - scp root@47.118.40.3:/build_project/ludu-admin-vue3/pc.zip /build_package/ + - scp /build_package/pc.zip root@121.36.203.133:/build_package/ + - name: build-vue + image: appleboy/drone-ssh # SSH工具镜像 - + settings: - - host: 1.14.205.126 # 远程连接地址 - + + host: 121.36.203.133 # 远程连接地址 + username: root # 远程连接账号 - - password: - - from_secret: ssh_password # 从Secret中读取SSH密码 - + + password: + + from_secret: ssh_password2 # 从Secret中读取SSH密码 + port: 22 # 远程连接端口 - + command_timeout: 30m # 远程执行命令超时时间 - + script: - echo "build-vue......" - cd /build_package - - rm -rf dist-prod - - unzip dist-prod.zip - - rm -rf /root/nginx/html/mall - - mv dist-prod /root/nginx/html/mall - + - rm -rf pc + - unzip pc.zip + - rm -rf /nginx/html/pc + - mv pc /nginx/html/pc From c373bcb8e032f8d4bbfbab9aa7d6ef0c93164c76 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 30 Oct 2024 14:03:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9E=84=E5=BB=BAvue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-vue.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.drone-vue.yml b/.drone-vue.yml index ef287cd..8f7b67c 100644 --- a/.drone-vue.yml +++ b/.drone-vue.yml @@ -26,22 +26,22 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 command_timeout: 20m # 远程执行命令超时时间 script: - - ssh root@47.118.40.3 "sh -c 'cd /build_project/ludu-admin-vue3 && git pull origin master && /usr/bin/pnpm install && /usr/bin/pnpm run build:prod && zip -r pc.zip pc'" - - scp root@47.118.40.3:/build_project/ludu-admin-vue3/pc.zip /build_package/ - - scp /build_package/pc.zip root@121.36.203.133:/build_package/ - - name: build-vue + - ssh root@47.118.40.3 "sh -c 'cd /build_project/allLikeMall/yudao-admin-vue3 && git pull origin master && /usr/bin/pnpm install && /usr/bin/pnpm run build:prod && zip -r dist-prod.zip dist-prod'" + - scp root@47.118.40.3:/build_project/allLikeMall/yudao-admin-vue3/dist-prod.zip /build_package/ + - scp /build_package/dist-prod.zip root@1.14.205.126:/build_package/ + - name: build-java-and-vue image: appleboy/drone-ssh # SSH工具镜像 settings: - host: 121.36.203.133 # 远程连接地址 + host: 1.14.205.126 # 远程连接地址 username: root # 远程连接账号 password: - from_secret: ssh_password2 # 从Secret中读取SSH密码 + from_secret: ssh_password # 从Secret中读取SSH密码 port: 22 # 远程连接端口 @@ -50,7 +50,8 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 script: - echo "build-vue......" - cd /build_package - - rm -rf pc - - unzip pc.zip - - rm -rf /nginx/html/pc - - mv pc /nginx/html/pc + - rm -rf dist-prod + - unzip dist-prod.zip + - rm -rf /root/nginx/html/mall + - mv dist-prod /root/nginx/html/mall +