钉钉通知修改为飞书

.idea/gradle.xml

@@ -7,14 +7,12 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/gradle/gradle-6.4.1" />
-        <option name="gradleJvm" value="#JAVA_HOME" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/kotlinc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.6.21" />
+  </component>
+</project>
\ No newline at end of file

build.gradle

@@ -250,7 +250,7 @@ task hot{
 }
 
 group 'com.qmai.android.plugin'
-version '1.90'
+version '1.91'
 
 gradlePublish {
 

local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Aug 24 09:52:39 CST 2021
-sdk.dir=/Users/leiwang/Library/Android/sdk
+#Wed Sep 28 14:35:34 CST 2022
+sdk.dir=/home/wanglei/Android/Sdk

src/main/groovy/com/qmai/android/plugin/DingDingDetailInfoModel.groovy

-package com.qmai.android.plugin
-
-class DingDingDetailInfoModel {
-    String content
-    DingDingDetailInfoModel(String content){
-        this.content = content
-    }
-
-}

src/main/groovy/com/qmai/android/plugin/FsDetailInfoModel.groovy

+package com.qmai.android.plugin
+
+class FsDetailInfoModel {
+    String text
+
+    FsDetailInfoModel(String content){
+        this.text = content
+    }
+
+}

src/main/groovy/com/qmai/android/plugin/DingDingInfoModel.groovy → src/main/groovy/com/qmai/android/plugin/FsInfoModel.groovy

@@ -3,13 +3,13 @@ package com.qmai.android.plugin
 con={"msgtype":"text","text":{"content":content}}
 */
 
-class DingDingInfoModel {
+class FsInfoModel {
 
-    String msgtype = "text"
-    DingDingDetailInfoModel text
+    String msg_type = "text"
+    FsDetailInfoModel content
 
-    DingDingInfoModel(DingDingDetailInfoModel text){
-        this.text = text
+    FsInfoModel(FsDetailInfoModel text){
+        this.content = text
     }
 
 }

src/main/groovy/com/qmai/android/plugin/OssUploadTask.groovy

@@ -14,7 +14,6 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
-import org.json.JSONObject
 
 import javax.inject.Inject
 import java.util.concurrent.TimeUnit
@@ -76,8 +75,8 @@ class OssUploadTask extends DefaultTask {
         MediaType JSON = MediaType.parse("application/json; charset=utf-8");
         def gson = new Gson()
         def content = "qmshopassitant: 下载地址为:  " + "https://files.qmai.cn/" + ossPath + fileName+" 当前环境: "+buildType +" 当前分支: "+getBranch()
-        def dingDingdetail = new DingDingDetailInfoModel(content)
-        def dingdingInfo = new DingDingInfoModel(dingDingdetail)
+        def dingDingdetail = new FsDetailInfoModel(content)
+        def dingdingInfo = new FsInfoModel(dingDingdetail)
         RequestBody requestBody = RequestBody.create(JSON, gson.toJson(dingdingInfo))
         OkHttpClient client = new OkHttpClient.Builder()
                 .callTimeout(60, TimeUnit.SECONDS)

src/main/groovy/com/qmai/android/plugin/PygerUploadTask.groovy

@@ -13,7 +13,6 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 import org.json.JSONException
-import org.json.JSONObject
 
 import javax.inject.Inject
 import java.util.concurrent.TimeUnit
@@ -72,19 +71,16 @@ class PygerUploadTask extends DefaultTask {
             }
 
             String content = file.name + ": 下载地址： " + " https://www.pgyer.com/" +
-                    payInfoBean.data.buildShortcutUrl + " \n二维码地址: " + payInfoBean.data.buildQRCodeURL + " 当前环境: " + buildType + " 当前分支:" + branch
+                    payInfoBean.data.buildShortcutUrl + " \n二维码地址: " + payInfoBean.data.buildQRCodeURL + " \n 当前环境: " + buildType + "\n 当前分支:" + branch
             println("dingding content = ${content}")
             MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-            JSONObject json = new JSONObject()
             try {
-                json.put("msgtype", "text:{\"content\":$content}")
-                json.put("text", content)
-                def dingDingdetail = new DingDingDetailInfoModel(content)
-                def dingdingInfo = new DingDingInfoModel(dingDingdetail)
-                RequestBody requestBody = RequestBody.create(JSON, gson.toJson(dingdingInfo))
+                def fsText = new FsDetailInfoModel(content)
+                def fs = new FsInfoModel(fsText)
+                RequestBody requestBody = RequestBody.create(JSON, gson.toJson(fs))
 
                 Request request2 = new Request.Builder()
-                        .url("https://oapi.dingtalk.com/robot/send?access_token=9839926e22043a7d391747e3cb14cc4e0dab7add001ce60f0d184f82e50301bc")
+                        .url("https://open.feishu.cn/open-apis/bot/v2/hook/64bff42a-a12a-4978-8456-ccabeb25858a")
                         .post(requestBody)
                         .build()
                 Response response2 = client.newCall(request2).execute()
@@ -106,6 +102,11 @@ class PygerUploadTask extends DefaultTask {
         }
     }
 
+
+    void uploadFs(String text){
+
+    }
+
     @Input
     boolean isInJenkins() {
         Map<String, String> map = System.getenv()

src/main/groovy/com/qmai/android/plugin/PygerUploadTask2.groovy

@@ -64,8 +64,8 @@ class PygerUploadTask2 extends DefaultTask {
             try {
                 json.put("msgtype", "text:{\"content\":$content}")
                 json.put("text", content)
-                def dingDingdetail = new DingDingDetailInfoModel(content)
-                def dingdingInfo = new DingDingInfoModel(dingDingdetail)
+                def dingDingdetail = new FsDetailInfoModel(content)
+                def dingdingInfo = new FsInfoModel(dingDingdetail)
                 RequestBody requestBody = RequestBody.create(JSON, gson.toJson(dingdingInfo))
 
                 Request request2 = new Request.Builder()