Skip to content

Commit

Permalink
Merge pull request #5 from manongxiaoyun/pgyer_developers_update
Browse files Browse the repository at this point in the history
Dandelion has modified the API for uploading APK or IPA, and the plug-in has made corresponding modifications
  • Loading branch information
manongxiaoyun committed Oct 25, 2022
2 parents 021aca8 + 0cf9ca8 commit 3a651dc
Show file tree
Hide file tree
Showing 14 changed files with 432 additions and 44 deletions.
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@
<email>myroid@foxmail.com</email>
<url>https://iamfan.net</url>
</developer>

<developer>
<id>Pgyer</id>
<name>pgyer</name>
<email>service@pgyer.com</email>
</developer>
</developers>

<repositories>
Expand Down
16 changes: 10 additions & 6 deletions src/main/java/ren/helloworld/upload2pgyer/UploadBuilderV2.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ public class UploadBuilderV2 extends Builder {
private final String buildInstallType;
private final Secret buildPassword;
private final String buildUpdateDescription;
private final String buildName;
private final String buildType;
private final String buildChannelShortcut;

private final String qrcodePath;
private final String envVarsPath;

@DataBoundConstructor
public UploadBuilderV2(String apiKey, String scanDir, String wildcard, String buildName, String buildInstallType, String buildPassword, String buildUpdateDescription, String buildChannelShortcut, String qrcodePath, String envVarsPath) {
public UploadBuilderV2(String apiKey, String scanDir, String wildcard, String buildType, String buildInstallType, String buildPassword, String buildUpdateDescription, String buildChannelShortcut, String qrcodePath, String envVarsPath) {
this.apiKey = Secret.fromString(apiKey);
this.scanDir = scanDir;
this.wildcard = wildcard;
this.buildName = buildName;
this.buildType = buildType;
this.buildPassword = Secret.fromString(buildPassword);
this.buildInstallType = buildInstallType;
this.buildUpdateDescription = buildUpdateDescription;
Expand Down Expand Up @@ -74,8 +74,8 @@ public String getBuildUpdateDescription() {
return buildUpdateDescription;
}

public String getBuildName() {
return buildName;
public String getBuildType() {
return buildType;
}

public String getBuildChannelShortcut() {
Expand All @@ -99,7 +99,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
paramsBeanV2.setBuildPassword(buildPassword.getPlainText());
paramsBeanV2.setBuildInstallType(buildInstallType);
paramsBeanV2.setBuildUpdateDescription(buildUpdateDescription);
paramsBeanV2.setBuildName(buildName);
paramsBeanV2.setBuildType(buildType);
paramsBeanV2.setBuildChannelShortcut(buildChannelShortcut);
paramsBeanV2.setQrcodePath(qrcodePath);
paramsBeanV2.setEnvVarsPath(envVarsPath);
Expand Down Expand Up @@ -132,6 +132,10 @@ public FormValidation doCheckWildcard(@QueryParameter String value) {
return ValidationParameters.doCheckWildcard(value);
}

public FormValidation doCheckBuildType(@QueryParameter String value) {
return ValidationParameters.doCheckBuildType(value);
}

public FormValidation doCheckBuildInstallType(@QueryParameter String value) {
installType = value;
return ValidationParameters.doCheckInstallType(value);
Expand Down
16 changes: 10 additions & 6 deletions src/main/java/ren/helloworld/upload2pgyer/UploadPublisherV2.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ public class UploadPublisherV2 extends Recorder {
private final String buildInstallType;
private final Secret buildPassword;
private final String buildUpdateDescription;
private final String buildName;
private final String buildType;
private final String buildChannelShortcut;

private final String qrcodePath;
private final String envVarsPath;

@DataBoundConstructor
public UploadPublisherV2(String apiKey, String scanDir, String wildcard, String buildName, String buildInstallType, String buildPassword, String buildUpdateDescription, String buildChannelShortcut, String qrcodePath, String envVarsPath) {
public UploadPublisherV2(String apiKey, String scanDir, String wildcard, String buildType, String buildInstallType, String buildPassword, String buildUpdateDescription, String buildChannelShortcut, String qrcodePath, String envVarsPath) {
this.apiKey = Secret.fromString(apiKey);
this.scanDir = scanDir;
this.wildcard = wildcard;
this.buildName = buildName;
this.buildType = buildType;
this.buildPassword = Secret.fromString(buildPassword);
this.buildInstallType = buildInstallType;
this.buildUpdateDescription = buildUpdateDescription;
Expand Down Expand Up @@ -76,8 +76,8 @@ public String getBuildUpdateDescription() {
return buildUpdateDescription;
}

public String getBuildName() {
return buildName;
public String getBuildType() {
return buildType;
}

public String getBuildChannelShortcut() {
Expand All @@ -100,7 +100,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
paramsBeanV2.setWildcard(wildcard);
paramsBeanV2.setBuildPassword(buildPassword.getPlainText());
paramsBeanV2.setBuildInstallType(buildInstallType);
paramsBeanV2.setBuildName(buildName);
paramsBeanV2.setBuildType(buildType);
paramsBeanV2.setBuildUpdateDescription(buildUpdateDescription);
paramsBeanV2.setBuildChannelShortcut(buildChannelShortcut);
paramsBeanV2.setQrcodePath(qrcodePath);
Expand Down Expand Up @@ -134,6 +134,10 @@ public FormValidation doCheckWildcard(@QueryParameter String value) {
return ValidationParameters.doCheckWildcard(value);
}

public FormValidation doCheckBuildType(@QueryParameter String value) {
return ValidationParameters.doCheckBuildType(value);
}

public FormValidation doCheckBuildInstallType(@QueryParameter String value) {
installType = value;
return ValidationParameters.doCheckInstallType(value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ public static FormValidation doCheckWildcard(String value) {
return FormValidation.ok();
}

public static FormValidation doCheckBuildType(String value) {
if (value.length() == 0) {
return FormValidation.error("Please set upload ipa or apk file buildType");
}
return FormValidation.ok();
}

public static FormValidation doCheckInstallType(String value) {
try {
int valueInt = Integer.parseInt(value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class ParamsBeanV2 {
private String buildInstallType;
private String buildPassword;
private String buildUpdateDescription;
private String buildName;
private String buildType;
private String buildChannelShortcut;

private String qrcodePath;
Expand Down Expand Up @@ -64,12 +64,12 @@ public void setBuildPassword(String buildPassword) {
this.buildPassword = buildPassword;
}

public String getBuildName() {
return buildName;
public String getBuildType() {
return buildType;
}

public void setBuildName(String buildName) {
this.buildName = buildName;
public void setBuildType(String buildType) {
this.buildType = buildType;
}

public String getBuildUpdateDescription() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package ren.helloworld.upload2pgyer.apiv2;

import com.google.gson.annotations.SerializedName;

public class PgyerTokenBeanV2 {

private int code;
private String message;
private DataBean data;

public int getCode() {
return code;
}

public void setCode(int code) {
this.code = code;
}

public String getMessage() {
return message;
}

public void setMessage(String message) {
this.message = message;
}

public DataBean getData() {
return data;
}

public void setData(DataBean data) {
this.data = data;
}

public static class DataBean {

private String key;
private String endpoint;
private Params params;

public String getKey() {
return key;
}

public void setKey(String key) {
this.key = key;
}

public String getEndpoint() {
return endpoint;
}

public void setEndpoint(String endpoint) {
this.endpoint = endpoint;
}

public Params getParams() {
return params;
}

public void setParams(Params params) {
this.params = params;
}
}

public static class Params {
private String key;
private String signature;
@SerializedName("x-cos-security-token")
private String x_cos_security_token;

public String getKey() {
return key;
}

public void setKey(String key) {
this.key = key;
}

public String getSignature() {
return signature;
}

public void setSignature(String signature) {
this.signature = signature;
}

public String getX_cos_security_token() {
return x_cos_security_token;
}

public void setX_cos_security_token(String x_cos_security_token) {
this.x_cos_security_token = x_cos_security_token;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package ren.helloworld.upload2pgyer.apiv2;

public class PgyerUploadResultBeanV2 {

private int code;
private String message;
private DataBean data;

public int getCode() {
return code;
}

public void setCode(int code) {
this.code = code;
}

public String getMessage() {
return message;
}

public void setMessage(String message) {
this.message = message;
}

public DataBean getData() {
return data;
}

public void setData(DataBean data) {
this.data = data;
}

public static class DataBean {

private String aKey;
private String viewBuildInfo;
private String viewApp;

public String getaKey() {
return aKey;
}

public void setaKey(String aKey) {
this.aKey = aKey;
}

public String getViewBuildInfo() {
return viewBuildInfo;
}

public void setViewBuildInfo(String viewBuildInfo) {
this.viewBuildInfo = viewBuildInfo;
}

public String getViewApp() {
return viewApp;
}

public void setViewApp(String viewApp) {
this.viewApp = viewApp;
}
}
}

0 comments on commit 3a651dc

Please sign in to comment.