Преглед изворни кода

[微信开发平台][修改]:基础配置可以不填写apps,错误信息整理

release_toaliyun_real
Stormeye Wu пре 7 година
родитељ
комит
28b4f7545c
3 измењених фајлова са 27 додато и 10 уклоњено
  1. +4
    -1
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  2. +2
    -2
      mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java
  3. +21
    -7
      mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java

+ 4
- 1
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, "扩展配置错误"),


/** /**
* 屏广告 * 屏广告


+ 2
- 2
mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java Прегледај датотеку

@@ -71,10 +71,10 @@ public class WechatWeappCodeController {
// 检查appId是否已授权 // 检查appId是否已授权
WxAuthorizerInfo authorizerInfo = authorizerInfoService.getByAppId(appId); WxAuthorizerInfo authorizerInfo = authorizerInfoService.getByAppId(appId);
if(authorizerInfo == null) { 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())) { 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); WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId);


+ 21
- 7
mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java Прегледај датотеку

@@ -103,6 +103,10 @@ public class WxWeappInfoController extends BaseController {
String appsStr = params.get("apps"); String appsStr = params.get("apps");
String typeStr = params.get("type"); String typeStr = params.get("type");


if(StringUtils.isBlank(typeStr)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "type参数不能为空");
}

Integer type = 0; Integer type = 0;
try { try {
type = Integer.parseInt(typeStr); type = Integer.parseInt(typeStr);
@@ -116,26 +120,36 @@ public class WxWeappInfoController extends BaseController {
WxWeappBasicSet weappBasicSet = weappBasicSetService.getByTypeAndDeploy(weappBasicSetQ); WxWeappBasicSet weappBasicSet = weappBasicSetService.getByTypeAndDeploy(weappBasicSetQ);
if(weappBasicSet == null) { if(weappBasicSet == null) {
logger.error("未找到相关的基础设置参数"); logger.error("未找到相关的基础设置参数");
return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR);
return new ResultData(ErrorCode.WEAPP_BASIC_SET_ERR);
} }


JSONObject domainObj = JSON.parseObject(weappBasicSet.getDomainUrl()); JSONObject domainObj = JSON.parseObject(weappBasicSet.getDomainUrl());
if(domainObj == null) { if(domainObj == null) {
logger.error("未找到相关的基础设置参数"); 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()); JSONObject templeObj = JSON.parseObject(weappBasicSet.getTemplateInfo());


if(StringUtils.isBlank(appsStr)) {
WxWeappInfo weappInfoQ = new WxWeappInfo();
weappInfoQ.setType(type);
List<WxWeappInfo> list = authorizerInfoService.getList(weappInfoQ);
for(WxWeappInfo info: list) {
appsStr += info.getAuthorizerAppid() + ",";
}
appsStr = appsStr.substring(0, appsStr.length() - 1);
}

// 逐一设置app配置 // 逐一设置app配置
String [] apps = appsStr.split(","); String [] apps = appsStr.split(",");
for(String appId: apps) { for(String appId: apps) {
// 检查appId是否已授权 // 检查appId是否已授权
WxAuthorizerInfo authorizerInfo = authorizerInfoService.getByAppId(appId); WxAuthorizerInfo authorizerInfo = authorizerInfoService.getByAppId(appId);
if(authorizerInfo == null) { 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())) { 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); ResultData openRet = setBasicForAppId(appId, weappBasicSet, domainObj, templeObj);
if (openRet != null) return openRet; if (openRet != null) return openRet;
@@ -149,7 +163,7 @@ public class WxWeappInfoController extends BaseController {
// 设置基础版本 // 设置基础版本
openMaService.setSupportVersion(weappBasicSet.getVersion()); openMaService.setSupportVersion(weappBasicSet.getVersion());
// 服务器域名 // 服务器域名
String action = "set";
String action = "add";
JSONObject urlObj = domainObj.getJSONObject("url"); JSONObject urlObj = domainObj.getJSONObject("url");
List<String> requestDomain = getUrlList(urlObj.getJSONArray("requestdomain")); List<String> requestDomain = getUrlList(urlObj.getJSONArray("requestdomain"));
List<String> wsrequestDomain = getUrlList(urlObj.getJSONArray("wsrequestdomain")); List<String> wsrequestDomain = getUrlList(urlObj.getJSONArray("wsrequestdomain"));
@@ -277,10 +291,10 @@ public class WxWeappInfoController extends BaseController {
// 检查appId是否已授权 // 检查appId是否已授权
WxAuthorizerInfo authorizerInfo = authorizerInfoService.getByAppId(appId); WxAuthorizerInfo authorizerInfo = authorizerInfoService.getByAppId(appId);
if(authorizerInfo == null) { 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())) { 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); codeOperation(appId, userVersion, userDesc, templateId);
} }


Loading…
Откажи
Сачувај