From 2596b5eef4b4b2440e8934efbfd479e5ea0374df Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 21 Aug 2020 10:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/ModifyDomainFormDTO.java | 4 ++++ .../main/java/com/epmet/dto/form/WebviewDomainFormDTO.java | 4 ++++ .../main/java/com/epmet/service/impl/SettingServiceImpl.java | 3 ++- .../src/main/java/com/epmet/wxapi/enums/WxMaErrorMsgEnum.java | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyDomainFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyDomainFormDTO.java index d8b78838e4..600b4d6b83 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyDomainFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyDomainFormDTO.java @@ -22,6 +22,10 @@ public class ModifyDomainFormDTO implements Serializable { * 客户端类型 */ private String clientType; + /** + * 操作类型:add 添加,delete 删除,set 覆盖 + */ + private String action; /** * request 合法域名 */ diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WebviewDomainFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WebviewDomainFormDTO.java index dc951e1b7b..2518bb28b4 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WebviewDomainFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WebviewDomainFormDTO.java @@ -21,6 +21,10 @@ public class WebviewDomainFormDTO implements Serializable { * 客户端类型 */ private String clientType; + /** + * 操作类型:add 添加,delete 删除,set 覆盖 + */ + private String action; /** * 业务域名 */ diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SettingServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SettingServiceImpl.java index 134ab97c06..e66d9b086f 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SettingServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SettingServiceImpl.java @@ -33,6 +33,7 @@ public class SettingServiceImpl implements SettingService { throw new RenException("未授权"); } WxMaModifyDomainReq request = new WxMaModifyDomainReq(); + request.setAction(formDTO.getAction()); request.setDownloadDomain(formDTO.getDownloadDomain()); request.setRequestDomain(formDTO.getRequestDomain()); request.setWsRequestDomain(formDTO.getWsRequestDomain()); @@ -52,7 +53,7 @@ public class SettingServiceImpl implements SettingService { throw new RenException("未授权"); } WxMaSetWebviewDomainReq request = new WxMaSetWebviewDomainReq(); - request.setAction("set"); + request.setAction(formDTO.getAction()); request.setWebViewDomain(formDTO.getWebViewDomain()); //设置业务域名 WxResult setWebviewDomain = wxMaSettingService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), request); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/enums/WxMaErrorMsgEnum.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/enums/WxMaErrorMsgEnum.java index 0c12488f48..23e1077e7c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/enums/WxMaErrorMsgEnum.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/enums/WxMaErrorMsgEnum.java @@ -354,6 +354,8 @@ public enum WxMaErrorMsgEnum { CODE_85062(85062, "手机号黑名单"), + CODE_85015(85015, "该账号不是小程序账号"), + CODE_85016(85016, "域名数量超过限制"), CODE_85017(85017, "没有新增域名，请确认小程序已经添加了域名或该域名是否没有在第三方平台添加"),