From 07027667d28493db603e512f39dfdca00f0d971f Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Fri, 2 Apr 2021 10:50:18 +0800 Subject: [PATCH 01/17] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index f2e056f..8ca4f39 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,7 +1,7 @@ kind: pipeline type: docker -name: 开发流水线 +name: 测试流水线 platform: os: linux arch: amd64 @@ -50,6 +50,6 @@ steps: - echo ====部署成功====== trigger: branch: - - master + - develop event: - push -- 2.34.1 From 3bf40106ea4625c05a6caab8b17b131cf25fab2b Mon Sep 17 00:00:00 2001 From: p47623895 <18235900245@163.com> Date: Fri, 9 Apr 2021 10:43:38 +0800 Subject: [PATCH 02/17] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 8ca4f39..36d3c47 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -9,6 +9,7 @@ steps: - name: maven image: maven:3-jdk-10 commands: + - ls - mvn install -DskipTests=true # 本模板示例为上传软件包和部署脚本到home目录 # host、username、password可在参数管理中配置 -- 2.34.1 From d57aaf0de7fd2931a78736d7f19a0b8a65c64606 Mon Sep 17 00:00:00 2001 From: p47623895 <18235900245@163.com> Date: Fri, 9 Apr 2021 10:45:05 +0800 Subject: [PATCH 03/17] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 36d3c47..8ca4f39 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -9,7 +9,6 @@ steps: - name: maven image: maven:3-jdk-10 commands: - - ls - mvn install -DskipTests=true # 本模板示例为上传软件包和部署脚本到home目录 # host、username、password可在参数管理中配置 -- 2.34.1 From 2c359e9fcdb4c80e4a08270155267a31c8f10081 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Mon, 27 Sep 2021 19:20:33 +0800 Subject: [PATCH 04/17] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a2a2e86..410bbe9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # ---> Java # Compiled class file *.class +#.fsl # Log file *.log -- 2.34.1 From 1e6673e5786446fe2b66dfcf300ae7d74fbf8cea Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 26 May 2022 09:41:06 +0800 Subject: [PATCH 05/17] Update HelloWorld.java --- src/main/java/controller/HelloWorld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/controller/HelloWorld.java b/src/main/java/controller/HelloWorld.java index 1a9f2e7..365f7aa 100644 --- a/src/main/java/controller/HelloWorld.java +++ b/src/main/java/controller/HelloWorld.java @@ -14,7 +14,7 @@ public class HelloWorld extends HttpServlet { @Override public void init() throws ServletException { - message = "Hello world, this message is from servlet! Good Luck."; + message = "Hello world, this message is from servlet! Good Luck. "; } @Override -- 2.34.1 From dadc1d9abdfb3e363c8275e37b77c911093ab9b7 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Thu, 13 Oct 2022 12:33:21 +0800 Subject: [PATCH 06/17] Update HelloWorld.java --- src/main/java/controller/HelloWorld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/controller/HelloWorld.java b/src/main/java/controller/HelloWorld.java index 365f7aa..96f4714 100644 --- a/src/main/java/controller/HelloWorld.java +++ b/src/main/java/controller/HelloWorld.java @@ -14,7 +14,7 @@ public class HelloWorld extends HttpServlet { @Override public void init() throws ServletException { - message = "Hello world, this message is from servlet! Good Luck. "; + message = "Hello world1, this message is from servlet! Good Luck. "; } @Override -- 2.34.1 From 289744dcda6a0bb5a2f170559d63ab32958b1794 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Thu, 13 Oct 2022 14:05:49 +0800 Subject: [PATCH 07/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3bd41fc..0e5f375 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,6 @@ #### 3. 构建成功后，访问如下链接，即可查看效果 -http://106.75.236.63:8080/demo/hello +http://117.50.189.36:8080/demo/hello ![](https://forge.educoder.net/api/attachments/1663377) -- 2.34.1 From f315ba935620f5dd61841cba0a9520295fb58601 Mon Sep 17 00:00:00 2001 From: Huang <635995834@qq.com> Date: Thu, 13 Oct 2022 19:20:50 +0800 Subject: [PATCH 08/17] temp --- temp.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 temp.txt diff --git a/temp.txt b/temp.txt new file mode 100644 index 0000000..e69de29 -- 2.34.1 From 0e3b60016a13075b1981fb2acb2474151bd9d854 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Mon, 7 Aug 2023 18:46:35 +0800 Subject: [PATCH 09/17] Update pom.xml --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index abb6bac..2f5ab92 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,6 @@ 1.8 5.6.2 - javax.servlet -- 2.34.1 From 7582d90962ec65ee9fb97bc3b261da0cb8c4f2cc Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Mon, 7 Aug 2023 18:53:19 +0800 Subject: [PATCH 10/17] Update temp.txt --- temp.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/temp.txt b/temp.txt index e69de29..84c22fd 100644 --- a/temp.txt +++ b/temp.txt @@ -0,0 +1 @@ +txt \ No newline at end of file -- 2.34.1 From c49c1a0a8b3b7fc86db6bbab09b8c134cf764cfb Mon Sep 17 00:00:00 2001 From: jasder duan Date: Tue, 8 Aug 2023 09:54:46 +0800 Subject: [PATCH 11/17] =?UTF-8?q?FIX=20=E6=9B=B4=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E7=9A=84=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=AB=AF=E5=8F=A3=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .trustie-pipeline.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 8ca4f39..2cb0d4c 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,15 +1,15 @@ - + kind: pipeline type: docker name: 测试流水线 platform: os: linux - arch: amd64 -steps: + arch: amd64 +steps: - name: maven image: maven:3-jdk-10 commands: - - mvn install -DskipTests=true + - mvn install -DskipTests=true # 本模板示例为上传软件包和部署脚本到home目录 # host、username、password可在参数管理中配置 - name: 上传文件 @@ -21,12 +21,12 @@ steps: from_secret: deploy_name password: from_secret: deploy_pwd - port: 3522 + port: 22 command_timeout: 2m target: /opt/demo source: - target/*.war - - Dockerfile + - Dockerfile # 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) # host、username、password可在参数管理中配置 - name: 远程主机部署 @@ -38,7 +38,7 @@ steps: from_secret: deploy_name password: from_secret: deploy_pwd - port: 3522 + port: 22 script: - echo ====暂停容器开始11======= - docker rm -f mo-test @@ -47,7 +47,7 @@ steps: - echo ====开始部署======= - docker build -t mo-test:1.0 . - docker run -d -p 8080:8080 --name mo-test mo-test:1.0 - - echo ====部署成功====== + - echo ====部署成功====== trigger: branch: - develop -- 2.34.1 From 0c3a39c4c49ee14608a9b811ea6b53359ee8ff96 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 8 Aug 2023 10:28:58 +0800 Subject: [PATCH 12/17] Update temp.txt --- temp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/temp.txt b/temp.txt index 84c22fd..9e27886 100644 --- a/temp.txt +++ b/temp.txt @@ -1 +1 @@ -txt \ No newline at end of file +txt file \ No newline at end of file -- 2.34.1 From 7a64c763f2f8ee4e27e87855a24b56989cf46525 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 8 Aug 2023 10:34:20 +0800 Subject: [PATCH 13/17] Update .trustie-pipeline.yml --- .trustie-pipeline.yml | 110 +++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 2cb0d4c..e1cc14f 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,55 +1,55 @@ - -kind: pipeline -type: docker -name: 测试流水线 -platform: - os: linux - arch: amd64 -steps: -- name: maven - image: maven:3-jdk-10 - commands: - - mvn install -DskipTests=true -# 本模板示例为上传软件包和部署脚本到home目录 -# host、username、password可在参数管理中配置 -- name: 上传文件 - image: appleboy/drone-scp - settings: - host: - from_secret: deploy_ip - username: - from_secret: deploy_name - password: - from_secret: deploy_pwd - port: 22 - command_timeout: 2m - target: /opt/demo - source: - - target/*.war - - Dockerfile -# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) -# host、username、password可在参数管理中配置 -- name: 远程主机部署 - image: appleboy/drone-ssh - settings: - host: - from_secret: deploy_ip - username: - from_secret: deploy_name - password: - from_secret: deploy_pwd - port: 22 - script: - - echo ====暂停容器开始11======= - - docker rm -f mo-test - - docker rmi mo-test:1.0 - - cd /opt/demo - - echo ====开始部署======= - - docker build -t mo-test:1.0 . - - docker run -d -p 8080:8080 --name mo-test mo-test:1.0 - - echo ====部署成功====== -trigger: - branch: - - develop - event: - - push + +kind: pipeline +type: docker +name: 测试流水线 +platform: + os: linux + arch: amd64 +steps: +- name: maven + image: maven:3-jdk-10 + commands: + - mvn package -DskipTests=true +# 本模板示例为上传软件包和部署脚本到home目录 +# host、username、password可在参数管理中配置 +- name: 上传文件 + image: appleboy/drone-scp + settings: + host: + from_secret: deploy_ip + username: + from_secret: deploy_name + password: + from_secret: deploy_pwd + port: 22 + command_timeout: 2m + target: /opt/demo + source: + - target/*.war + - Dockerfile +# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) +# host、username、password可在参数管理中配置 +- name: 远程主机部署 + image: appleboy/drone-ssh + settings: + host: + from_secret: deploy_ip + username: + from_secret: deploy_name + password: + from_secret: deploy_pwd + port: 22 + script: + - echo ====暂停容器开始11======= + - docker rm -f mo-test + - docker rmi mo-test:1.0 + - cd /opt/demo + - echo ====开始部署======= + - docker build -t mo-test:1.0 . + - docker run -d -p 8080:8080 --name mo-test mo-test:1.0 + - echo ====部署成功====== +trigger: + branch: + - develop + event: + - push -- 2.34.1 From 6554da7dad0a8053657fa760da86086008bfee2c Mon Sep 17 00:00:00 2001 From: jasder <2053003901@qq.com> Date: Thu, 27 Mar 2025 23:14:43 +0800 Subject: [PATCH 14/17] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 81 ++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 52 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index e1cc14f..ea31d38 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,55 +1,32 @@ -kind: pipeline -type: docker -name: 测试流水线 -platform: - os: linux +kind: pipeline +type: docker +name: push 操作 +platform: + os: linux arch: amd64 steps: -- name: maven - image: maven:3-jdk-10 - commands: - - mvn package -DskipTests=true -# 本模板示例为上传软件包和部署脚本到home目录 -# host、username、password可在参数管理中配置 -- name: 上传文件 - image: appleboy/drone-scp - settings: - host: - from_secret: deploy_ip - username: - from_secret: deploy_name - password: - from_secret: deploy_pwd - port: 22 - command_timeout: 2m - target: /opt/demo - source: - - target/*.war - - Dockerfile -# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) -# host、username、password可在参数管理中配置 -- name: 远程主机部署 - image: appleboy/drone-ssh - settings: - host: - from_secret: deploy_ip - username: - from_secret: deploy_name - password: - from_secret: deploy_pwd - port: 22 - script: - - echo ====暂停容器开始11======= - - docker rm -f mo-test - - docker rmi mo-test:1.0 - - cd /opt/demo - - echo ====开始部署======= - - docker build -t mo-test:1.0 . - - docker run -d -p 8080:8080 --name mo-test mo-test:1.0 - - echo ====部署成功====== -trigger: - branch: - - develop - event: - - push +- name: maven + image: maven:3-jdk-10 + commands: + - mvn install -DskipTests=true +# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) +# host、username、password可在参数管理中配置 +- name: 远程主机部署 + image: appleboy/drone-ssh + settings: + host: + from_secret: ip + username: + from_secret: name + password: + from_secret: pwd + port: 22 + script: + - chmod +x /home/deploy.sh + - ./home/deploy.sh +trigger: + branch: + - develop + event: + - push -- 2.34.1 From 50b215552e37f346311790182217100e3b69d03c Mon Sep 17 00:00:00 2001 From: jasder <2053003901@qq.com> Date: Thu, 27 Mar 2025 23:15:17 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .trustie-pipeline.yml | 82 +++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index ea31d38..769f3c8 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,32 +1,54 @@ - -kind: pipeline -type: docker -name: push 操作 -platform: - os: linux +kind: pipeline +type: docker +name: 测试流水线 +platform: + os: linux arch: amd64 steps: -- name: maven - image: maven:3-jdk-10 - commands: - - mvn install -DskipTests=true -# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) -# host、username、password可在参数管理中配置 -- name: 远程主机部署 - image: appleboy/drone-ssh - settings: - host: - from_secret: ip - username: - from_secret: name - password: - from_secret: pwd - port: 22 - script: - - chmod +x /home/deploy.sh - - ./home/deploy.sh -trigger: - branch: - - develop - event: - - push +- name: maven + image: maven:3-jdk-10 + commands: + - mvn package -DskipTests=true +# 本模板示例为上传软件包和部署脚本到home目录 +# host、username、password可在参数管理中配置 +- name: 上传文件 + image: appleboy/drone-scp + settings: + host: + from_secret: deploy_ip + username: + from_secret: deploy_name + password: + from_secret: deploy_pwd + port: 22 + command_timeout: 2m + target: /opt/demo + source: + - target/*.war + - Dockerfile +# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) +# host、username、password可在参数管理中配置 +- name: 远程主机部署 + image: appleboy/drone-ssh + settings: + host: + from_secret: deploy_ip + username: + from_secret: deploy_name + password: + from_secret: deploy_pwd + port: 22 + script: + - echo ====暂停容器开始11======= + - docker rm -f mo-test + - docker rmi mo-test:1.0 + - cd /opt/demo + - echo ====开始部署======= + - docker build -t mo-test:1.0 . + - docker run -d -p 8080:8080 --name mo-test mo-test:1.0 + - echo ====部署成功====== +trigger: + branch: + - develop + event: + - push \ No newline at end of file -- 2.34.1 From c140f79ad24479afbcafa8eaf74f39d499836546 Mon Sep 17 00:00:00 2001 From: jasder <2053003901@qq.com> Date: Thu, 27 Mar 2025 23:17:29 +0800 Subject: [PATCH 16/17] Update temp.txt --- temp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/temp.txt b/temp.txt index 9e27886..873e3d0 100644 --- a/temp.txt +++ b/temp.txt @@ -1 +1 @@ -txt file \ No newline at end of file +txt file . \ No newline at end of file -- 2.34.1 From f91329812817eae94d35f155221aa286466f6e03 Mon Sep 17 00:00:00 2001 From: jasder <2053003901@qq.com> Date: Thu, 27 Mar 2025 23:21:30 +0800 Subject: [PATCH 17/17] Update HelloWorld.java --- src/main/java/controller/HelloWorld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/controller/HelloWorld.java b/src/main/java/controller/HelloWorld.java index 96f4714..365f7aa 100644 --- a/src/main/java/controller/HelloWorld.java +++ b/src/main/java/controller/HelloWorld.java @@ -14,7 +14,7 @@ public class HelloWorld extends HttpServlet { @Override public void init() throws ServletException { - message = "Hello world1, this message is from servlet! Good Luck. "; + message = "Hello world, this message is from servlet! Good Luck. "; } @Override -- 2.34.1