| @@ -416,8 +416,8 @@ public class WxOpenComponentServiceImpl implements WxOpenComponentService { | |||||
| public List<WxOpenMaCodeTemplate> getTemplateList() throws WxErrorException { | public List<WxOpenMaCodeTemplate> getTemplateList() throws WxErrorException { | ||||
| String responseContent = get(GET_TEMPLATE_LIST_URL, "access_token"); | String responseContent = get(GET_TEMPLATE_LIST_URL, "access_token"); | ||||
| JsonObject response = JSON_PARSER.parse(StringUtils.defaultString(responseContent, "{}")).getAsJsonObject(); | JsonObject response = JSON_PARSER.parse(StringUtils.defaultString(responseContent, "{}")).getAsJsonObject(); | ||||
| boolean hasDraftList = response.has("template_list"); | |||||
| if (hasDraftList) { | |||||
| boolean hasTemplateList = response.has("template_list"); | |||||
| if (hasTemplateList) { | |||||
| return WxOpenGsonBuilder.create().fromJson(response.getAsJsonArray("template_list"), | return WxOpenGsonBuilder.create().fromJson(response.getAsJsonArray("template_list"), | ||||
| new TypeToken<List<WxOpenMaCodeTemplate>>() { | new TypeToken<List<WxOpenMaCodeTemplate>>() { | ||||
| }.getType()); | }.getType()); | ||||
| @@ -2,6 +2,7 @@ package me.chanjar.weixin.open.bean.ma; | |||||
| import com.google.gson.annotations.SerializedName; | import com.google.gson.annotations.SerializedName; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @@ -14,6 +15,8 @@ import java.util.Map; | |||||
| * 微信小程序三方平台代上传代码提交额外信息对象 | * 微信小程序三方平台代上传代码提交额外信息对象 | ||||
| * <p> | * <p> | ||||
| * 如果代码中已经有配置,则配置的合并规则为:除了pages和tabBar.list直接覆盖原配置,其他都为插入或同级覆盖。 | * 如果代码中已经有配置,则配置的合并规则为:除了pages和tabBar.list直接覆盖原配置,其他都为插入或同级覆盖。 | ||||
| * extjson 详细说明 | |||||
| * https://developers.weixin.qq.com/miniprogram/dev/devtools/ext.html#%E5%B0%8F%E7%A8%8B%E5%BA%8F%E6%A8%A1%E6%9D%BF%E5%BC%80%E5%8F%91 | |||||
| * </p> | * </p> | ||||
| * | * | ||||
| * @author yqx | * @author yqx | ||||
| @@ -31,6 +34,16 @@ public class WxMaOpenCommitExtInfo implements Serializable { | |||||
| */ | */ | ||||
| private String extAppid; | private String extAppid; | ||||
| /** | |||||
| * 配置 ext.json 是否生效 | |||||
| */ | |||||
| private Boolean extEnable = Boolean.TRUE; | |||||
| /** | |||||
| * 是否直接提交到待审核列表 | |||||
| */ | |||||
| private Boolean directCommit = Boolean.FALSE; | |||||
| @SerializedName("ext") | @SerializedName("ext") | ||||
| private Map<String, Object> extMap; | private Map<String, Object> extMap; | ||||
| @@ -99,4 +112,8 @@ public class WxMaOpenCommitExtInfo implements Serializable { | |||||
| public static WxMaOpenCommitExtInfo INSTANCE() { | public static WxMaOpenCommitExtInfo INSTANCE() { | ||||
| return new WxMaOpenCommitExtInfo(); | return new WxMaOpenCommitExtInfo(); | ||||
| } | } | ||||
| public String toJson() { | |||||
| return WxOpenGsonBuilder.create().toJson(this); | |||||
| } | |||||
| } | } | ||||
| @@ -18,4 +18,12 @@ public class WxMaOpenTab implements Serializable { | |||||
| private String text; | private String text; | ||||
| private String iconPath; | private String iconPath; | ||||
| private String selectedIconPath; | private String selectedIconPath; | ||||
| public WxMaOpenTab(String pagePath, String text) { | |||||
| this.pagePath = pagePath; | |||||
| this.text = text; | |||||
| } | |||||
| } | } | ||||
| @@ -16,6 +16,21 @@ import java.util.List; | |||||
| @Data | @Data | ||||
| public class WxOpenMaSubmitAuditMessage implements Serializable { | public class WxOpenMaSubmitAuditMessage implements Serializable { | ||||
| /** | |||||
| * 提交审核项的一个列表(至少填写1项,至多填写5项) | |||||
| */ | |||||
| @SerializedName("item_list") | @SerializedName("item_list") | ||||
| private List<WxOpenMaSubmitAudit> itemList; | private List<WxOpenMaSubmitAudit> itemList; | ||||
| /** | |||||
| * 反馈内容,不超过200字 | |||||
| */ | |||||
| @SerializedName("feedback_info") | |||||
| private String feedbackInfo; | |||||
| /** | |||||
| * 图片media_id列表,中间用“丨”分割,xx丨yy丨zz,不超过5张图片, 其中 media_id 可以通过新增临时素材接口上传而得到 | |||||
| */ | |||||
| @SerializedName("feedback_stuff") | |||||
| private String feedbackStuff; | |||||
| } | } | ||||