..

.gitignore

@@ -1,5 +1,7 @@
 # ---> Java
+#
 # Compiled class file
+fsf 
 *.class
 
 # Log file
@@ -22,3 +24,4 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+*.mac

.trustie-pipeline.yml

@@ -1,15 +1,14 @@
-
 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: 上传文件
@@ -26,7 +25,7 @@ steps:
     target: /opt/demo
     source: 
       - target/*.war
-      - Dockerfile
+      - Dockerfile
 # 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板)
 # host、username、password可在参数管理中配置
 - name: 远程主机部署
@@ -47,9 +46,4 @@ steps:
       - echo ====开始部署=======
       - docker build -t mo-test:1.0 .
       - docker run -d -p 8080:8080 --name mo-test mo-test:1.0
-      - echo ====部署成功======
-trigger:
-  branch:
-  - master
-  event:
-  - push
+      - echo ====部署成功======

Dockerfile

@@ -1,6 +1,6 @@
 
 #添加docker镜像
-FROM tomcat
+FROM tomcat:8.5.83-jdk8-temurin-focal
 
 #添加作者信息
 MAINTAINER moshenglv@163.com

README.md

@@ -1,15 +1,15 @@
 
-## 操作步骤
+## 操作步骤11
 
 #### 1. 在线修改信息 src/main/java/controller/HelloWorld.java 文件信息内容,如下图:
 
 ![](https://forge.educoder.net/api/attachments/1663370?raw=true)
 
-#### 2. 修改成功后，会自动出发构建、自动测试、自动部署
-![](https://forge.educoder.net/api/attachments/1663375)
+#### 2. 修改成功后，会自动触发构建、自动测试、自动部署
+![](https://forge.educoder.net/api/attachments/1663375?raw=true)
 
 
 #### 3. 构建成功后，访问如下链接，即可查看效果
 http://106.75.236.63:8080/demo/hello
 
-![](https://forge.educoder.net/api/attachments/1663377)
+![](https://forge.educoder.net/api/attachments/1663377?raw=true)

hello_world.java

@@ -0,0 +1 @@
+// hello world java .

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.example</groupId>
@@ -9,6 +9,7 @@
     <version>1</version>
     <name>demo</name>
     <packaging>war</packaging>
+    
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>

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! 2022-10-13 14:38";
     }
 
     @Override