Commit bb5d9819 authored by wanglei's avatar wanglei

v1.103发布&解决上传蒲公英超时

parent 0ecc03de
......@@ -4,8 +4,15 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="1.8" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</GradleProjectSettings>
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="1.8" />
<option name="modules">
......
<component name="libraryTable">
<library name="groovy-5.0.0-alpha-1" type="groovy-sdk">
<properties version="5.0.0-alpha-1" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/groovy-astbuilder-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-dateutil-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-datetime-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-cli-picocli-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-cli-commons-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-ant-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-docgenerator-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-jsr223-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-jmx-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-json-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-groovydoc-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-ginq-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-console-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-groovysh-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-macro-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-contracts-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-servlet-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-nio-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-macro-library-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-sql-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-test-junit5-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-swing-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-testng-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-toml-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-typecheckers-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-xml-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-test-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-templates-5.0.0-alpha-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-5.0.0-alpha-1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/groovy-astbuilder-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-ant-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-cli-picocli-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-cli-commons-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-console-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-dateutil-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-datetime-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-docgenerator-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-contracts-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-ginq-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-groovydoc-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-jsr223-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-jmx-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-macro-library-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-macro-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-nio-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-json-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-groovysh-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-servlet-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-typecheckers-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-test-junit5-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-toml-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-test-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-sql-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-xml-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-swing-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-templates-5.0.0-alpha-1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/groovy-testng-5.0.0-alpha-1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
......
......@@ -2,5 +2,6 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
......@@ -251,7 +251,7 @@ task hot{
}
group 'com.qmai.android.plugin'
version '1.100'
version '1.103'
gradlePublish {
......
......@@ -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.
#Wed Sep 28 14:35:34 CST 2022
sdk.dir=/home/wanglei/Android/Sdk
#Tue Aug 22 12:10:35 CST 2023
sdk.dir=/Users/leiwang/Library/Android/sdk
......@@ -11,7 +11,7 @@ class OssFileUploadPlugin implements Plugin<Project> {
project.afterEvaluate {
def uploadFile = new File(ossUploadFileBean.localPath)
println("single upload file "+uploadFile.exists() + " "+uploadFile.absolutePath)
project.getTasks().create("uploadOssFile", OssUploadTask.class, uploadFile,ossUploadFileBean.ossPath,"","","")
project.getTasks().register("uploadOssFile", OssUploadTask.class, uploadFile,ossUploadFileBean.ossPath,"","","")
}
}
......
......@@ -86,7 +86,10 @@ class OssUploadTask extends DefaultTask {
//钉钉通知
MediaType JSON = MediaType.parse("application/json; charset=utf-8");
def gson = new Gson()
def content = "${appName.isEmpty() ? file.name : appName}: 下载地址为: https://files.qmai.cn/$ossPath$fileName\n当前环境: $buildType\n目标cpu: $flavor\n当前分支: ${getBranch()}"
//https://cli.im/api/qrcode/code?text
def downloadUrl = "https://files.qmai.cn/$ossPath$fileName"
def qrDownloadUrl = "https://cli.im/api/qrcode/code?text=${downloadUrl}"
def content = "${appName.isEmpty() ? file.name : appName}: 下载地址为: https://files.qmai.cn/$ossPath$fileName\n 二维码地址:$qrDownloadUrl\n 当前环境: $buildType\n目标cpu: $flavor\n当前分支: ${getBranch()}"
def dingDingdetail = new FsDetailInfoModel(content)
def dingdingInfo = new FsInfoModel(dingDingdetail)
RequestBody requestBody = RequestBody.create(JSON, gson.toJson(dingdingInfo))
......
......@@ -9,12 +9,13 @@ import org.gradle.api.Project
class PygerUploadPlugin implements Plugin<Project> {
@Override
void apply(Project project) {
println("create pgyer upload task")
PygerBean pygerBean = project.getExtensions().create("pyger", PygerBean.class)
project.afterEvaluate {
println("create pgyer upload task afterEvaluate filepath= "+pygerBean.filePath+" key = "+pygerBean.key)
def uploadFile = new File(pygerBean.filePath)
println("PygerUploadPlugin file path = "+pygerBean.filePath+" file key = "+pygerBean.key)
project.getTasks().create("pygerUpload", PygerUploadTask.class, uploadFile,"1", pygerBean.key,"","")
project.getTasks().register("pygerUpload", PygerUploadTask.class, uploadFile,"1", pygerBean.key,"","")
}
}
}
package com.qmai.android.plugin
class PygerUploadToken {
String key
String endpoint
Map<String ,String> params
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment