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
+

.trustie-pipeline.yml

@@ -10,25 +10,6 @@ steps:
   image: maven:3-jdk-10
   commands:
   - mvn install -DskipTests=true
-- name: gradle
-  image: gradle:jdk10
-  commands:
-  - gradle build -x test
-# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板)
-# 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

1.txt

@@ -1,3 +1,6 @@
-ci test
-java jar
-123123
+111-222
+asdfl
+cssdf
+
+sdlsls
+s123

2.txt

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

pom.xml

@@ -9,7 +9,6 @@
     <version>1</version>
     <name>demo</name>
     <packaging>war</packaging>
-     <packaging>war</packaging>
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>

test.txt

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