ソースを参照

[C端小程序][修改]:C端小程序支持自定义菜单

release^2
Stormeye Wu 6年前
コミット
98b55db4d0
7個のファイルの変更151行の追加56行の削除
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java
  2. +38
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/utils/Constant.java
  4. +48
    -0
      mallinkService/src/main/java/com/iformall/utils/OpenConstant.java
  5. +5
    -4
      mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java
  6. +10
    -8
      mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java
  7. +45
    -43
      mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java ファイルの表示

@@ -5,7 +5,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import java.util.*; import java.util.*;
import java.util.List;


@TableName(value = "wx_weapp_ext_set") @TableName(value = "wx_weapp_ext_set")
@Data @Data
@@ -25,6 +24,8 @@ public class WxWeappExtSet extends BaseEntity {
private String releaseJson; private String releaseJson;
@io.swagger.annotations.ApiModelProperty(value="停车(0:不支持,1:etcp)",name="carSupport") @io.swagger.annotations.ApiModelProperty(value="停车(0:不支持,1:etcp)",name="carSupport")
private Integer carSupport; private Integer carSupport;
@io.swagger.annotations.ApiModelProperty(value="菜单(0:全有,1:我的/首页, 2:无停车)",name="storeApp")
private Integer storeApp;
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate; private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")


+ 38
- 0
mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java ファイルの表示

@@ -0,0 +1,38 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumEnableType {

// 0: SUCCESS, 1: FAIL

SUCC(0, "SUCCESS"),
FAIL(1, "FAIL"),
;

public static EnumEnableType getEnum(Integer code) {
for (EnumEnableType value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumEnableType(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/utils/Constant.java ファイルの表示

@@ -8,6 +8,9 @@ public class Constant {


public static final int SYS_MENU_MAX = 2000; // 系统菜单最大值 public static final int SYS_MENU_MAX = 2000; // 系统菜单最大值


public static final String C = "C";
public static final String B = "B";



// 1小时过期, // 1小时过期,
public final static int H_EXPIRE = 3600000; public final static int H_EXPIRE = 3600000;


+ 48
- 0
mallinkService/src/main/java/com/iformall/utils/OpenConstant.java ファイルの表示

@@ -0,0 +1,48 @@
package com.iformall.utils;

public class OpenConstant {

public static final String EXT = "ext";
public static final String ATTR = "attr";
public static final String EXT_APPID = "extAppid";
public static final String WE_APPID = "weappId";
public static final String NAME = "name";
public static final String TYPE = "type";
public static final String VERSION = "version";
public static final String TEMPLATE_ID = "templateId";

public static final String APPS = "apps";

public static final String APP_VERSION = "appVersion";
public static final String USER_VERSION = "userVersion";
public static final String USER_DESC = "userDesc";

public static final String ID = "id";
public static final String KEY_ID_LIST = "keyword_id_list";
public static final String CUSTOM_PARAM = "custom_param";

public static final String IF_HAVE_CAR_MODULE = "ifHaveCarModular";
public static final String IF_STORE_APP = "ifStoreApp";


public static final String ERRCODE = "errcode";
public static final Integer SUCC = 0;

public static final String VERIFY_SUCC = "verify_success";
public static final String VERIFY_FAIL = "verify_fail";
public static final String SET = "set";
public static final String URL = "url";
public static final String REQ_DOMAIN = "requestdomain";
public static final String WS_DOMAIN = "wsrequestdomain";
public static final String UPLOAD_DOMAIN = "uploaddomain";
public static final String DOWNLOAD_DOMAIN = "downloaddomain";

public static final String WEB = "web";
public static final String WEB_DOMAIN = "webviewdomain";


public static final String ERR_CODE_APP_IS_RELEASED = "85052";
public static final Integer ERR_APP_IS_RELEASED = 85052;


}

+ 5
- 4
mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java ファイルの表示

@@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxAuthorizerInfo; import com.iformall.domain.po.WxAuthorizerInfo;
import com.iformall.enums.EnumEnableType;
import com.iformall.enums.EnumWxAuthorizationStatus; import com.iformall.enums.EnumWxAuthorizationStatus;
import com.iformall.service.WxAuthorizerInfoService; import com.iformall.service.WxAuthorizerInfoService;
import com.iformall.service.wechat.FmOpenService; import com.iformall.service.wechat.FmOpenService;
@@ -107,13 +108,13 @@ public class WechatWeappSetController {
logger.info(openRet.toString()); logger.info(openRet.toString());
if(openRet.isSuccess()) { if(openRet.isSuccess()) {
logger.info("设置服务器域名成功"); logger.info("设置服务器域名成功");
authorizerInfo.setDomainStatus(0);
authorizerInfo.setDomainStatus(EnumEnableType.SUCC.getCode());
authorizerInfo.setDomainTime(new Date()); authorizerInfo.setDomainTime(new Date());
authorizerInfo.setUpdateTime(new Date()); authorizerInfo.setUpdateTime(new Date());


} else { } else {
logger.info("设置服务器域名成功"); logger.info("设置服务器域名成功");
authorizerInfo.setDomainStatus(1);
authorizerInfo.setDomainStatus(EnumEnableType.FAIL.getCode());
authorizerInfo.setDomainTime(new Date()); authorizerInfo.setDomainTime(new Date());
authorizerInfo.setUpdateTime(new Date()); authorizerInfo.setUpdateTime(new Date());
} }
@@ -146,12 +147,12 @@ public class WechatWeappSetController {
JSONObject webRetObj = JSON.parseObject(openRet); JSONObject webRetObj = JSON.parseObject(openRet);
if(webRetObj.getInteger("errcode").equals(0)) { if(webRetObj.getInteger("errcode").equals(0)) {
logger.info("设置服务器业务域名成功"); logger.info("设置服务器业务域名成功");
authorizerInfo.setWebdomainStatus(0);
authorizerInfo.setWebdomainStatus(EnumEnableType.SUCC.getCode());
authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setWebdomainTime(new Date());
authorizerInfo.setUpdateTime(new Date()); authorizerInfo.setUpdateTime(new Date());
} else { } else {
logger.info("设置服务器业务域名失败"); logger.info("设置服务器业务域名失败");
authorizerInfo.setWebdomainStatus(1);
authorizerInfo.setWebdomainStatus(EnumEnableType.FAIL.getCode());
authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setWebdomainTime(new Date());
authorizerInfo.setUpdateTime(new Date()); authorizerInfo.setUpdateTime(new Date());
} }


+ 10
- 8
mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java ファイルの表示

@@ -11,6 +11,7 @@ import com.iformall.domain.po.WxWeappExtSet;
import com.iformall.enums.EnumAppType; import com.iformall.enums.EnumAppType;
import com.iformall.service.WxAppinfoService; import com.iformall.service.WxAppinfoService;
import com.iformall.service.WxWeappExtSetService; import com.iformall.service.WxWeappExtSetService;
import com.iformall.utils.OpenConstant;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -89,11 +90,11 @@ public class WxWeappExtSetController extends BaseController {
if(obj == null) { if(obj == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }
JSONObject extObj = obj.getJSONObject("ext");
JSONObject extObj = obj.getJSONObject(OpenConstant.EXT);
if(extObj == null) { if(extObj == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }
JSONObject attrObj = extObj.getJSONObject("attr");
JSONObject attrObj = extObj.getJSONObject(OpenConstant.ATTR);
if(attrObj == null) { if(attrObj == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }
@@ -105,19 +106,20 @@ public class WxWeappExtSetController extends BaseController {
if(appinfo == null) { if(appinfo == null) {
continue; continue;
} }
obj.put("extAppid", info.getAppId());
obj.put(OpenConstant.EXT_APPID, info.getAppId());
if(weappExtSet.getType().equals(EnumAppType.C.getCode())) { if(weappExtSet.getType().equals(EnumAppType.C.getCode())) {
if (attrObj != null) { if (attrObj != null) {
attrObj.put("ifHaveCarModular", String.valueOf(info.getCarSupport()));
attrObj.put(OpenConstant.IF_HAVE_CAR_MODULE, String.valueOf(info.getCarSupport()));
attrObj.put(OpenConstant.IF_STORE_APP, String.valueOf(info.getStoreApp()));
} }
} }
if(extObj != null) { if(extObj != null) {
extObj.put("weappId", info.getAppId());
extObj.put("name", appinfo.getName());
extObj.put(OpenConstant.WE_APPID, info.getAppId());
extObj.put(OpenConstant.NAME, appinfo.getName());
if(weappExtSet.getType().equals(EnumAppType.C.getCode())) { if(weappExtSet.getType().equals(EnumAppType.C.getCode())) {
extObj.put("attr", attrObj);
extObj.put(OpenConstant.ATTR, attrObj);
} }
obj.put("ext", extObj);
obj.put(OpenConstant.EXT, extObj);
} }


WxWeappExtSet newInfo = new WxWeappExtSet(); WxWeappExtSet newInfo = new WxWeappExtSet();


+ 45
- 43
mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java ファイルの表示

@@ -21,6 +21,8 @@ import com.iformall.domain.vo.WxWeappReleaseStatusVo;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.service.wechat.FmOpenService; import com.iformall.service.wechat.FmOpenService;
import com.iformall.utils.Constant;
import com.iformall.utils.OpenConstant;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -121,8 +123,8 @@ public class WxWeappInfoController extends BaseController {
@PostMapping("batchBasicSet") @PostMapping("batchBasicSet")
public ResultData batchSet(@RequestBody Map<String, String> params) { public ResultData batchSet(@RequestBody Map<String, String> params) {
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchBasicSet"); logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchBasicSet");
String appsStr = params.get("apps");
String typeStr = params.get("type");
String appsStr = params.get(OpenConstant.APPS);
String typeStr = params.get(OpenConstant.TYPE);


if(StringUtils.isBlank(typeStr)) { if(StringUtils.isBlank(typeStr)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "type参数不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "type参数不能为空");
@@ -236,9 +238,9 @@ public class WxWeappInfoController extends BaseController {
return; return;
} }
logger.info(msgObj.toJSONString()); logger.info(msgObj.toJSONString());
String id = msgObj.getString("id");
JSONArray keyidlist = msgObj.getJSONArray("keyword_id_list");
String customParam = msgObj.getString("custom_param");
String id = msgObj.getString(OpenConstant.ID);
JSONArray keyidlist = msgObj.getJSONArray(OpenConstant.KEY_ID_LIST);
String customParam = msgObj.getString(OpenConstant.CUSTOM_PARAM);
logger.info(customParam); logger.info(customParam);
JSONObject customParamObj = JSON.parseObject(customParam); JSONObject customParamObj = JSON.parseObject(customParam);
List<Integer> keyArr1 = getIdList(keyidlist); List<Integer> keyArr1 = getIdList(keyidlist);
@@ -264,12 +266,12 @@ public class WxWeappInfoController extends BaseController {


private void setBasicTemplateMsgVerifySuccess(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException { private void setBasicTemplateMsgVerifySuccess(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException {
// 核销成功消息 // 核销成功消息
setBasicTemplateMsg(templeObj, appinfo, maService, EnumTemplateType.VERIFY_SUCCESS.getCode(), "verify_success");
setBasicTemplateMsg(templeObj, appinfo, maService, EnumTemplateType.VERIFY_SUCCESS.getCode(), OpenConstant.VERIFY_SUCC);
} }


private void setBasicTemplateMsgVerifyFail(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException { private void setBasicTemplateMsgVerifyFail(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException {
// 核销失败消息 // 核销失败消息
setBasicTemplateMsg(templeObj, appinfo, maService, EnumTemplateType.VERIFY_FAIL.getCode(), "verify_fail");
setBasicTemplateMsg(templeObj, appinfo, maService, EnumTemplateType.VERIFY_FAIL.getCode(), OpenConstant.VERIFY_FAIL);
} }


private void setBasicTemplateMsgPressSuccess(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException { private void setBasicTemplateMsgPressSuccess(JSONObject templeObj, WxAppinfo appinfo, WxMaService maService) throws WxErrorException {
@@ -282,12 +284,12 @@ public class WxWeappInfoController extends BaseController {


private void setDomainUrl(JSONObject domainObj, WxAuthorizerInfo authorizerInfo, WxOpenMaService openMaService) throws WxErrorException { private void setDomainUrl(JSONObject domainObj, WxAuthorizerInfo authorizerInfo, WxOpenMaService openMaService) throws WxErrorException {
// 服务器域名 // 服务器域名
String action = "set";
JSONObject urlObj = domainObj.getJSONObject("url");
List<String> requestDomain = getUrlList(urlObj.getJSONArray("requestdomain"));
List<String> wsrequestDomain = getUrlList(urlObj.getJSONArray("wsrequestdomain"));
List<String> uploadDomain = getUrlList(urlObj.getJSONArray("uploaddomain"));
List<String> downloadDomain = getUrlList(urlObj.getJSONArray("downloaddomain"));
String action = OpenConstant.SET;
JSONObject urlObj = domainObj.getJSONObject(OpenConstant.URL);
List<String> requestDomain = getUrlList(urlObj.getJSONArray(OpenConstant.REQ_DOMAIN));
List<String> wsrequestDomain = getUrlList(urlObj.getJSONArray(OpenConstant.WS_DOMAIN));
List<String> uploadDomain = getUrlList(urlObj.getJSONArray(OpenConstant.UPLOAD_DOMAIN));
List<String> downloadDomain = getUrlList(urlObj.getJSONArray(OpenConstant.DOWNLOAD_DOMAIN));
logger.info(downloadDomain.toString()); logger.info(downloadDomain.toString());
WxOpenMaDomainResult openRet = openMaService.modifyDomain(action, WxOpenMaDomainResult openRet = openMaService.modifyDomain(action,
requestDomain, wsrequestDomain, requestDomain, wsrequestDomain,
@@ -295,31 +297,31 @@ public class WxWeappInfoController extends BaseController {
logger.info(openRet.toString()); logger.info(openRet.toString());
if(openRet.isSuccess()) { if(openRet.isSuccess()) {
logger.info("设置服务器域名成功"); logger.info("设置服务器域名成功");
authorizerInfo.setDomainStatus(0);
authorizerInfo.setDomainStatus(EnumEnableType.SUCC.getCode());
authorizerInfo.setDomainTime(new Date()); authorizerInfo.setDomainTime(new Date());
authorizerInfo.setUpdateTime(new Date()); authorizerInfo.setUpdateTime(new Date());


} else { } else {
logger.info("设置服务器域名成功"); logger.info("设置服务器域名成功");
authorizerInfo.setDomainStatus(1);
authorizerInfo.setDomainStatus(EnumEnableType.FAIL.getCode());
authorizerInfo.setDomainTime(new Date()); authorizerInfo.setDomainTime(new Date());
authorizerInfo.setUpdateTime(new Date()); authorizerInfo.setUpdateTime(new Date());
} }
authorizerInfoService.updateDomainUrl(authorizerInfo); authorizerInfoService.updateDomainUrl(authorizerInfo);
// 业务域名 // 业务域名
JSONObject webObj = domainObj.getJSONObject("web");
List<String> urlList = getUrlList(webObj.getJSONArray("webviewdomain"));
JSONObject webObj = domainObj.getJSONObject(OpenConstant.WEB);
List<String> urlList = getUrlList(webObj.getJSONArray(OpenConstant.WEB_DOMAIN));
String openRet1 = openMaService.setWebViewDomain(action, urlList); String openRet1 = openMaService.setWebViewDomain(action, urlList);
logger.info(openRet1); logger.info(openRet1);
JSONObject webRetObj = JSON.parseObject(openRet1); JSONObject webRetObj = JSON.parseObject(openRet1);
if(webRetObj.getInteger("errcode").equals(0)) {
if(webRetObj.getInteger(OpenConstant.ERRCODE).equals(0)) {
logger.info("设置服务器业务域名成功"); logger.info("设置服务器业务域名成功");
authorizerInfo.setWebdomainStatus(0);
authorizerInfo.setWebdomainStatus(EnumEnableType.SUCC.getCode());
authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setWebdomainTime(new Date());
authorizerInfo.setUpdateTime(new Date()); authorizerInfo.setUpdateTime(new Date());
} else { } else {
logger.info("设置服务器业务域名失败"); logger.info("设置服务器业务域名失败");
authorizerInfo.setWebdomainStatus(1);
authorizerInfo.setWebdomainStatus(EnumEnableType.FAIL.getCode());
authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setWebdomainTime(new Date());
authorizerInfo.setUpdateTime(new Date()); authorizerInfo.setUpdateTime(new Date());
} }
@@ -331,10 +333,10 @@ public class WxWeappInfoController extends BaseController {
String versionRet = openMaService.setSupportVersion(weappBasicSet.getVersion()); String versionRet = openMaService.setSupportVersion(weappBasicSet.getVersion());
logger.info(versionRet); logger.info(versionRet);
JSONObject verObj = JSON.parseObject(versionRet); JSONObject verObj = JSON.parseObject(versionRet);
if(verObj.getInteger("errcode").equals(0)) {
authorizerInfo.setBaseStatus(0);
if(verObj.getInteger(OpenConstant.ERRCODE).equals(OpenConstant.SUCC)) {
authorizerInfo.setBaseStatus(EnumEnableType.SUCC.getCode());
} else { } else {
authorizerInfo.setBaseStatus(1);
authorizerInfo.setBaseStatus(EnumEnableType.FAIL.getCode());
} }
authorizerInfo.setBaseTime(new Date()); authorizerInfo.setBaseTime(new Date());
authorizerInfo.setUpdateTime(new Date()); authorizerInfo.setUpdateTime(new Date());
@@ -361,11 +363,11 @@ public class WxWeappInfoController extends BaseController {
@PostMapping("batchCodeCommit") @PostMapping("batchCodeCommit")
public ResultData batchCodeCommit(@RequestBody Map<String, String> params) { public ResultData batchCodeCommit(@RequestBody Map<String, String> params) {
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchExtSet"); logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchExtSet");
String appsStr = params.get("apps");
String templateIdStr = params.get("templateId");
String typeStr = params.get("type");
String userVersion = params.get("userVersion");
String userDesc = params.get("userDesc");
String appsStr = params.get(OpenConstant.APPS);
String templateIdStr = params.get(OpenConstant.TEMPLATE_ID);
String typeStr = params.get(OpenConstant.TYPE);
String userVersion = params.get(OpenConstant.USER_VERSION);
String userDesc = params.get(OpenConstant.USER_DESC);


Integer type = null; Integer type = null;
Long templateId = null; Long templateId = null;
@@ -436,9 +438,9 @@ public class WxWeappInfoController extends BaseController {


int iAppType = 0; int iAppType = 0;
String appTypeStr = userVersion.substring(0, 1); String appTypeStr = userVersion.substring(0, 1);
if(appTypeStr.equalsIgnoreCase("C"))
if(appTypeStr.equalsIgnoreCase(Constant.C))
iAppType = EnumAppType.C.getCode(); iAppType = EnumAppType.C.getCode();
else if(appTypeStr.equalsIgnoreCase("B"))
else if(appTypeStr.equalsIgnoreCase(Constant.B))
iAppType = EnumAppType.B.getCode(); iAppType = EnumAppType.B.getCode();


if(!appinfo.getType().equals(iAppType)) { if(!appinfo.getType().equals(iAppType)) {
@@ -466,9 +468,9 @@ public class WxWeappInfoController extends BaseController {
@PostMapping("batchCodeAudit") @PostMapping("batchCodeAudit")
public ResultData batchCodeAudit(@RequestBody Map<String, String> params) { public ResultData batchCodeAudit(@RequestBody Map<String, String> params) {
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchExtSet"); logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchExtSet");
String appsStr = params.get("apps");
String typeStr = params.get("type");
String userVersion = params.get("userVersion");
String appsStr = params.get(OpenConstant.APPS);
String typeStr = params.get(OpenConstant.TYPE);
String userVersion = params.get(OpenConstant.USER_VERSION);
Integer type = null; Integer type = null;
try { try {
type = Integer.parseInt(typeStr); type = Integer.parseInt(typeStr);
@@ -560,8 +562,8 @@ public class WxWeappInfoController extends BaseController {
WxMaOpenCommitExtInfo extInfo = gson.fromJson(extSet.getExtJson(), new TypeToken<WxMaOpenCommitExtInfo>() {}.getType()); WxMaOpenCommitExtInfo extInfo = gson.fromJson(extSet.getExtJson(), new TypeToken<WxMaOpenCommitExtInfo>() {}.getType());
logger.info("OLD: " + extInfo.toString()); logger.info("OLD: " + extInfo.toString());
// 自动修改提交的版本 // 自动修改提交的版本
if(extInfo.getExtMap().containsKey("appVersion")) {
extInfo.getExtMap().put("appVersion", userVersion);
if(extInfo.getExtMap().containsKey(OpenConstant.APP_VERSION)) {
extInfo.getExtMap().put(OpenConstant.APP_VERSION, userVersion);
} }
logger.info("NEW: " + extInfo.toString()); logger.info("NEW: " + extInfo.toString());
WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appinfo.getAppId()); WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appinfo.getAppId());
@@ -677,8 +679,8 @@ public class WxWeappInfoController extends BaseController {
public ResultData batchAuditQuery(@RequestBody Map<String, String> params) { public ResultData batchAuditQuery(@RequestBody Map<String, String> params) {
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchAuditQuery"); logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchAuditQuery");
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();
String typeStr = params.get("type");
String version = params.get("version");
String typeStr = params.get(OpenConstant.TYPE);
String version = params.get(OpenConstant.VERSION);
Integer type = null; Integer type = null;
try { try {
type = Integer.parseInt(typeStr); type = Integer.parseInt(typeStr);
@@ -736,8 +738,8 @@ public class WxWeappInfoController extends BaseController {
public ResultData batchAuditCancel(@RequestBody Map<String, String> params) { public ResultData batchAuditCancel(@RequestBody Map<String, String> params) {
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchAuditCancel"); logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchAuditCancel");
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();
String typeStr = params.get("type");
String version = params.get("version");
String typeStr = params.get(OpenConstant.TYPE);
String version = params.get(OpenConstant.VERSION);
Integer type = null; Integer type = null;
try { try {
type = Integer.parseInt(typeStr); type = Integer.parseInt(typeStr);
@@ -777,8 +779,8 @@ public class WxWeappInfoController extends BaseController {
public ResultData batchRelease(@RequestBody Map<String, String> params) { public ResultData batchRelease(@RequestBody Map<String, String> params) {
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchRelease"); logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchRelease");
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();
String typeStr = params.get("type");
String version = params.get("version");
String typeStr = params.get(OpenConstant.TYPE);
String version = params.get(OpenConstant.VERSION);
Integer type = null; Integer type = null;
try { try {
type = Integer.parseInt(typeStr); type = Integer.parseInt(typeStr);
@@ -827,7 +829,7 @@ public class WxWeappInfoController extends BaseController {
if(releaseSuccess) { if(releaseSuccess) {
releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode());
} else { } else {
if(openRet.getErrcode().equals("85052")) {
if(openRet.getErrcode().equals(OpenConstant.ERR_CODE_APP_IS_RELEASED)) {
releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode());
} else { } else {
releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode());
@@ -842,7 +844,7 @@ public class WxWeappInfoController extends BaseController {
} }
} catch (WxErrorException e) { } catch (WxErrorException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
if(e.getError().getErrorCode() == 85052) {
if(e.getError().getErrorCode() == OpenConstant.ERR_APP_IS_RELEASED) {
releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode());
} else { } else {
releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode());


読み込み中…
キャンセル
保存