From 28b4f7545c2458601f5dc77403f724650257d309 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 21 Feb 2019 13:43:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=BC=80=E5=8F=91=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0][=E4=BF=AE=E6=94=B9]:=E5=9F=BA=E7=A1=80=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8F=AF=E4=BB=A5=E4=B8=8D=E5=A1=AB=E5=86=99apps,?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/common/ErrorCode.java | 5 +++- .../controller/WechatWeappCodeController.java | 4 +-- .../controller/WxWeappInfoController.java | 28 ++++++++++++++----- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 53c341e8b..625e43cf9 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -340,7 +340,10 @@ public enum ErrorCode{ /** * 微信第三方 */ - APP_NOT_AUTH(24000, "app未授权"), + WEAPP_APPID_NOT_AUTH(24000, "appid未授权"), + WEAPP_BASIC_SET_ERR(24001, "基础配置错误"), + WEAPP_BASIC_SET_DOMAIN_ERR(24002, "基础服务器域名配置错误"), + WEAPP_EXT_SET_ERR(24003, "扩展配置错误"), /** * 屏广告 diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java index 1e0c1821e..cf237308f 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java @@ -71,10 +71,10 @@ public class WechatWeappCodeController { // 检查appId是否已授权 WxAuthorizerInfo authorizerInfo = authorizerInfoService.getByAppId(appId); if(authorizerInfo == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "扩展设置中appId未设置"); + return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); } if(!authorizerInfo.getAuthorizationStatus().equals(EnumWxAuthorizationStatus.AUTHORIZED.getCode())) { - return new ResultData(ErrorCode.APP_NOT_AUTH); + return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); } WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId); diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index c073c863b..c002f6d71 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -103,6 +103,10 @@ public class WxWeappInfoController extends BaseController { String appsStr = params.get("apps"); String typeStr = params.get("type"); + if(StringUtils.isBlank(typeStr)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "type参数不能为空"); + } + Integer type = 0; try { type = Integer.parseInt(typeStr); @@ -116,26 +120,36 @@ public class WxWeappInfoController extends BaseController { WxWeappBasicSet weappBasicSet = weappBasicSetService.getByTypeAndDeploy(weappBasicSetQ); if(weappBasicSet == null) { logger.error("未找到相关的基础设置参数"); - return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR); + return new ResultData(ErrorCode.WEAPP_BASIC_SET_ERR); } JSONObject domainObj = JSON.parseObject(weappBasicSet.getDomainUrl()); if(domainObj == null) { logger.error("未找到相关的基础设置参数"); - return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR); + return new ResultData(ErrorCode.WEAPP_BASIC_SET_DOMAIN_ERR); } JSONObject templeObj = JSON.parseObject(weappBasicSet.getTemplateInfo()); + if(StringUtils.isBlank(appsStr)) { + WxWeappInfo weappInfoQ = new WxWeappInfo(); + weappInfoQ.setType(type); + List list = authorizerInfoService.getList(weappInfoQ); + for(WxWeappInfo info: list) { + appsStr += info.getAuthorizerAppid() + ","; + } + appsStr = appsStr.substring(0, appsStr.length() - 1); + } + // 逐一设置app配置 String [] apps = appsStr.split(","); for(String appId: apps) { // 检查appId是否已授权 WxAuthorizerInfo authorizerInfo = authorizerInfoService.getByAppId(appId); if(authorizerInfo == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); } if(!authorizerInfo.getAuthorizationStatus().equals(EnumWxAuthorizationStatus.AUTHORIZED.getCode())) { - return new ResultData(ErrorCode.APP_NOT_AUTH); + return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); } ResultData openRet = setBasicForAppId(appId, weappBasicSet, domainObj, templeObj); if (openRet != null) return openRet; @@ -149,7 +163,7 @@ public class WxWeappInfoController extends BaseController { // 设置基础版本 openMaService.setSupportVersion(weappBasicSet.getVersion()); // 服务器域名 - String action = "set"; + String action = "add"; JSONObject urlObj = domainObj.getJSONObject("url"); List requestDomain = getUrlList(urlObj.getJSONArray("requestdomain")); List wsrequestDomain = getUrlList(urlObj.getJSONArray("wsrequestdomain")); @@ -277,10 +291,10 @@ public class WxWeappInfoController extends BaseController { // 检查appId是否已授权 WxAuthorizerInfo authorizerInfo = authorizerInfoService.getByAppId(appId); if(authorizerInfo == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); } if(!authorizerInfo.getAuthorizationStatus().equals(EnumWxAuthorizationStatus.AUTHORIZED.getCode())) { - return new ResultData(ErrorCode.APP_NOT_AUTH); + return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); } codeOperation(appId, userVersion, userDesc, templateId); }