Update '.trustie-pipeline.yml'

.devops/PR通知.yml

@@ -1,33 +0,0 @@
-version: 2
-name: PR通知
-description: 新的PR提交会有钉钉通知
-global:
-  concurrent: 1
-trigger:
-  webhook: gitlink@1.0.0
-  event:
-    - ref: pr
-      ruleset-operator: AND
-workflow:
-  - ref: start
-    name: 开始
-    task: start
-  - ref: end
-    name: 结束
-    task: end
-    needs:
-      - dingtalk_notice_text_0
-  - ref: dingtalk_notice_text_0
-    name: 钉钉通知-文本
-    task: dingtalk_notice_text@1.0.2
-    input:
-      boot_webhook_url: ((dingdingtalk.token_url))
-      secret: ((dingdingtalk.token_sercet))
-      msg_text: '"【"+((trigger.user)) +
-        "】从"+((trigger.source_branch))+"提交PR到"+((trigger.target_branch)) +
-        "，请您立即确认是否合并。"'
-      at_user_ids: '"[]"'
-      at_mobiles: '"[]"'
-    needs:
-      - start
-

.gitignore

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

.trustie-pipeline.yml

@@ -1,17 +1,44 @@
 
 kind: pipeline
 type: docker
-name: master
+name: develop流水线
 platform:
   os: linux
-  arch: amd64
+  arch: arm64
 steps:
 - name: maven
   image: maven:3-jdk-10
   commands:
   - mvn install -DskipTests=true
+- name: maven
+  image: maven:3-jdk-10
+  commands:
+  - mvn install -DskipTests=true
+- name: maven
+  image: maven:3-jdk-10
+  commands:
+  - mvn install -DskipTests=true
+- 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:
-  - master
+  - develop
   event:
   - push

1.txt

@@ -1,6 +1,3 @@
-111-222
+ci test
-asdfl
+error?
-cssdf
+dev
-
-sdlsls
-s123

2.txt

@@ -1 +0,0 @@
-123123

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?raw=true)
+![](https://forge.educoder.net/api/attachments/1663375)
 
 
 #### 3. 构建成功后，访问如下链接，即可查看效果
 http://106.75.236.63:8080/demo/hello
 
-![](https://forge.educoder.net/api/attachments/1663377?raw=true)
+![](https://forge.educoder.net/api/attachments/1663377)

hello_world.java

@@ -1 +0,0 @@
-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"
+         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">
+         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>

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! last mody";
+        message = "Hello world, this message is from servlet! Good Luck.a";
     }
 
     @Override

test.txt

@@ -1,7 +0,0 @@
-测试devops提交pr
-
-啦111
-
-123123
-
-12314