diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java index 7b34d2761..cb3595836 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java @@ -277,17 +277,20 @@ public interface WxOpenMaService extends WxMaService { /** * 修改域名 - * + * 文档地址 * @param action delete删除, set覆盖, get获取 - * @param requestDomains the requestdomain list - * @param wsRequestDomains the wsrequestdomain list - * @param uploadDomains the uploaddomain list - * @param downloadDomains the downloaddomain list + * @param requestDomains request 合法域名；当 action 是 get 时不需要此字段 + * @param wsRequestDomains socket 合法域名；当 action 是 get 时不需要此字段 + * @param uploadDomains uploadFile 合法域名；当 action 是 get 时不需要此字段 + * @param downloadDomains downloadFile 合法域名；当 action 是 get 时不需要此字段 + * @param tcpDomains tcp 合法域名；当 action 是 get 时不需要此字段 + * @param udpDomains udp 合法域名；当 action 是 get 时不需要此字段 * @return the wx open ma domain result * @throws WxErrorException the wx error exception */ WxOpenMaDomainResult modifyDomain(String action, List requestDomains, List wsRequestDomains, - List uploadDomains, List downloadDomains) throws WxErrorException; + List uploadDomains, List downloadDomains, + List udpDomains, List tcpDomains) throws WxErrorException; /** * 获取小程序的业务域名 diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java index 886fbe127..146273f4e 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java @@ -36,6 +36,8 @@ import java.util.Map; * created on 2018-09-12 */ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaService { + private static final String ACTION = "action"; + private static final String ACTION_GET = "get"; private final WxOpenComponentService wxOpenComponentService; private final WxMaConfig wxMaConfig; private final String appId; @@ -73,41 +75,44 @@ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaServ @Override public WxOpenMaDomainResult getDomain() throws WxErrorException { - return modifyDomain("get", null, null, null, null); + return modifyDomain(ACTION_GET, null, null, null, + null, null, null); } @Override - public WxOpenMaDomainResult modifyDomain(String action, List requestDomains, List wsRequestDomains, List uploadDomains, List downloadDomains) throws WxErrorException { -// if (!"get".equals(action) && (requestdomainList == null || wsrequestdomainList == null || uploaddomainList == null || downloaddomainList == null)) { -// throw new WxErrorException(WxError.builder().errorCode(44004).errorMsg("域名参数不能为空").build()); -// } + public WxOpenMaDomainResult modifyDomain(String action, List requestDomains, List wsRequestDomains, + List uploadDomains, List downloadDomains, + List udpDomains, List tcpDomains) throws WxErrorException { JsonObject requestJson = new JsonObject(); - requestJson.addProperty("action", action); - if (!"get".equals(action)) { + requestJson.addProperty(ACTION, action); + if (!ACTION_GET.equals(action)) { requestJson.add("requestdomain", toJsonArray(requestDomains)); requestJson.add("wsrequestdomain", toJsonArray(wsRequestDomains)); requestJson.add("uploaddomain", toJsonArray(uploadDomains)); requestJson.add("downloaddomain", toJsonArray(downloadDomains)); + requestJson.add("udpdomain", toJsonArray(udpDomains)); + requestJson.add("tcpdomain", toJsonArray(tcpDomains)); } + String response = post(API_MODIFY_DOMAIN, GSON.toJson(requestJson)); return WxMaGsonBuilder.create().fromJson(response, WxOpenMaDomainResult.class); } @Override public String getWebViewDomain() throws WxErrorException { - return setWebViewDomain("get", null); + return setWebViewDomain(ACTION_GET, null); } @Override public WxOpenMaWebDomainResult getWebViewDomainInfo() throws WxErrorException { - return setWebViewDomainInfo("get", null); + return setWebViewDomainInfo(ACTION_GET, null); } @Override public String setWebViewDomain(String action, List domainList) throws WxErrorException { JsonObject requestJson = new JsonObject(); - requestJson.addProperty("action", action); - if (!"get".equals(action)) { + requestJson.addProperty(ACTION, action); + if (!ACTION_GET.equals(action)) { requestJson.add("webviewdomain", toJsonArray(domainList)); } return post(API_SET_WEBVIEW_DOMAIN, GSON.toJson(requestJson)); @@ -159,7 +164,7 @@ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaServ @Override public WxOpenMaTesterListResult getTesterList() throws WxErrorException { JsonObject paramJson = new JsonObject(); - paramJson.addProperty("action", "get_experiencer"); + paramJson.addProperty(ACTION, "get_experiencer"); String response = post(API_GET_TESTERLIST, GSON.toJson(paramJson)); return WxMaGsonBuilder.create().fromJson(response, WxOpenMaTesterListResult.class); } @@ -255,7 +260,7 @@ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaServ @Override public WxOpenResult changeVisitStatus(String action) throws WxErrorException { JsonObject params = new JsonObject(); - params.addProperty("action", action); + params.addProperty(ACTION, action); String response = post(API_CHANGE_VISITSTATUS, GSON.toJson(params)); return WxMaGsonBuilder.create().fromJson(response, WxOpenResult.class); } @@ -450,7 +455,7 @@ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaServ @Override public WxOpenMaApplyLiveInfoResult applyLiveInfo() throws WxErrorException { JsonObject params = new JsonObject(); - params.addProperty("action", "apply"); + params.addProperty(ACTION, "apply"); String response = post(API_WX_APPLY_LIVE_INFO, GSON.toJson(params)); return WxMaGsonBuilder.create().fromJson(response, WxOpenMaApplyLiveInfoResult.class); }