Merge pull request '111' (#14) from dev_local_v1 into master

.devops/PR通知.yml

@@ -0,0 +1,33 @@
+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,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,7 +1,7 @@
 
 kind: pipeline
 type: docker
-name: 开发流水线
+name: master
 platform:
   os: linux
   arch: amd64
@@ -10,44 +10,6 @@ steps:
   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: 3522
-    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: 3522
-    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:
   - master

1.txt

@@ -0,0 +1,6 @@
+111-222
+asdfl
+cssdf
+
+sdlsls
+s123

2.txt

@@ -0,0 +1 @@
+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)
+![](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>

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! last mody";
     }
 
     @Override

test.txt

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