From 98b55db4d04dfa2a7fdb0fe7b1aa076077b7d002 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 11 Sep 2019 16:26:56 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:C=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxWeappExtSet.java | 3 +- .../com/iformall/enums/EnumEnableType.java | 38 ++++++++ .../java/com/iformall/utils/Constant.java | 3 + .../java/com/iformall/utils/OpenConstant.java | 48 ++++++++++ .../controller/WechatWeappSetController.java | 9 +- .../controller/WxWeappExtSetController.java | 18 ++-- .../controller/WxWeappInfoController.java | 88 ++++++++++--------- 7 files changed, 151 insertions(+), 56 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java create mode 100644 mallinkService/src/main/java/com/iformall/utils/OpenConstant.java diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java index 4994f2b..92034c7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.util.*; -import java.util.List; @TableName(value = "wx_weapp_ext_set") @Data @@ -25,6 +24,8 @@ public class WxWeappExtSet extends BaseEntity { private String releaseJson; @io.swagger.annotations.ApiModelProperty(value="停车(0:不支持,1:etcp)",name="carSupport") private Integer carSupport; + @io.swagger.annotations.ApiModelProperty(value="菜单(0:全有,1:我的/首页, 2:无停车)",name="storeApp") + private Integer storeApp; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java b/mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java new file mode 100644 index 0000000..7400713 --- /dev/null +++ b/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; + } +} diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index e6b5ac8..a729490 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/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 String C = "C"; + public static final String B = "B"; + // 1小时过期, public final static int H_EXPIRE = 3600000; diff --git a/mallinkService/src/main/java/com/iformall/utils/OpenConstant.java b/mallinkService/src/main/java/com/iformall/utils/OpenConstant.java new file mode 100644 index 0000000..9040fdf --- /dev/null +++ b/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; + + +} diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java index 583a48c..5df98e3 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java +++ b/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.ResultData; import com.iformall.domain.po.WxAuthorizerInfo; +import com.iformall.enums.EnumEnableType; import com.iformall.enums.EnumWxAuthorizationStatus; import com.iformall.service.WxAuthorizerInfoService; import com.iformall.service.wechat.FmOpenService; @@ -107,13 +108,13 @@ public class WechatWeappSetController { logger.info(openRet.toString()); if(openRet.isSuccess()) { logger.info("设置服务器域名成功"); - authorizerInfo.setDomainStatus(0); + authorizerInfo.setDomainStatus(EnumEnableType.SUCC.getCode()); authorizerInfo.setDomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } else { logger.info("设置服务器域名成功"); - authorizerInfo.setDomainStatus(1); + authorizerInfo.setDomainStatus(EnumEnableType.FAIL.getCode()); authorizerInfo.setDomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } @@ -146,12 +147,12 @@ public class WechatWeappSetController { JSONObject webRetObj = JSON.parseObject(openRet); if(webRetObj.getInteger("errcode").equals(0)) { logger.info("设置服务器业务域名成功"); - authorizerInfo.setWebdomainStatus(0); + authorizerInfo.setWebdomainStatus(EnumEnableType.SUCC.getCode()); authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } else { logger.info("设置服务器业务域名失败"); - authorizerInfo.setWebdomainStatus(1); + authorizerInfo.setWebdomainStatus(EnumEnableType.FAIL.getCode()); authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java index 46c15df..4fac15e 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java +++ b/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.service.WxAppinfoService; import com.iformall.service.WxWeappExtSetService; +import com.iformall.utils.OpenConstant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -89,11 +90,11 @@ public class WxWeappExtSetController extends BaseController { if(obj == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - JSONObject extObj = obj.getJSONObject("ext"); + JSONObject extObj = obj.getJSONObject(OpenConstant.EXT); if(extObj == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - JSONObject attrObj = extObj.getJSONObject("attr"); + JSONObject attrObj = extObj.getJSONObject(OpenConstant.ATTR); if(attrObj == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } @@ -105,19 +106,20 @@ public class WxWeappExtSetController extends BaseController { if(appinfo == null) { continue; } - obj.put("extAppid", info.getAppId()); + obj.put(OpenConstant.EXT_APPID, info.getAppId()); if(weappExtSet.getType().equals(EnumAppType.C.getCode())) { 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) { - 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())) { - extObj.put("attr", attrObj); + extObj.put(OpenConstant.ATTR, attrObj); } - obj.put("ext", extObj); + obj.put(OpenConstant.EXT, extObj); } WxWeappExtSet newInfo = new WxWeappExtSet(); diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index d8f92da..9a834fd 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/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.service.*; 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.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -121,8 +123,8 @@ public class WxWeappInfoController extends BaseController { @PostMapping("batchBasicSet") public ResultData batchSet(@RequestBody Map params) { 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)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "type参数不能为空"); @@ -236,9 +238,9 @@ public class WxWeappInfoController extends BaseController { return; } 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); JSONObject customParamObj = JSON.parseObject(customParam); List keyArr1 = getIdList(keyidlist); @@ -264,12 +266,12 @@ public class WxWeappInfoController extends BaseController { 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 { // 核销失败消息 - 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 { @@ -282,12 +284,12 @@ public class WxWeappInfoController extends BaseController { private void setDomainUrl(JSONObject domainObj, WxAuthorizerInfo authorizerInfo, WxOpenMaService openMaService) throws WxErrorException { // 服务器域名 - String action = "set"; - JSONObject urlObj = domainObj.getJSONObject("url"); - List requestDomain = getUrlList(urlObj.getJSONArray("requestdomain")); - List wsrequestDomain = getUrlList(urlObj.getJSONArray("wsrequestdomain")); - List uploadDomain = getUrlList(urlObj.getJSONArray("uploaddomain")); - List downloadDomain = getUrlList(urlObj.getJSONArray("downloaddomain")); + String action = OpenConstant.SET; + JSONObject urlObj = domainObj.getJSONObject(OpenConstant.URL); + List requestDomain = getUrlList(urlObj.getJSONArray(OpenConstant.REQ_DOMAIN)); + List wsrequestDomain = getUrlList(urlObj.getJSONArray(OpenConstant.WS_DOMAIN)); + List uploadDomain = getUrlList(urlObj.getJSONArray(OpenConstant.UPLOAD_DOMAIN)); + List downloadDomain = getUrlList(urlObj.getJSONArray(OpenConstant.DOWNLOAD_DOMAIN)); logger.info(downloadDomain.toString()); WxOpenMaDomainResult openRet = openMaService.modifyDomain(action, requestDomain, wsrequestDomain, @@ -295,31 +297,31 @@ public class WxWeappInfoController extends BaseController { logger.info(openRet.toString()); if(openRet.isSuccess()) { logger.info("设置服务器域名成功"); - authorizerInfo.setDomainStatus(0); + authorizerInfo.setDomainStatus(EnumEnableType.SUCC.getCode()); authorizerInfo.setDomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } else { logger.info("设置服务器域名成功"); - authorizerInfo.setDomainStatus(1); + authorizerInfo.setDomainStatus(EnumEnableType.FAIL.getCode()); authorizerInfo.setDomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } authorizerInfoService.updateDomainUrl(authorizerInfo); // 业务域名 - JSONObject webObj = domainObj.getJSONObject("web"); - List urlList = getUrlList(webObj.getJSONArray("webviewdomain")); + JSONObject webObj = domainObj.getJSONObject(OpenConstant.WEB); + List urlList = getUrlList(webObj.getJSONArray(OpenConstant.WEB_DOMAIN)); String openRet1 = openMaService.setWebViewDomain(action, urlList); logger.info(openRet1); JSONObject webRetObj = JSON.parseObject(openRet1); - if(webRetObj.getInteger("errcode").equals(0)) { + if(webRetObj.getInteger(OpenConstant.ERRCODE).equals(0)) { logger.info("设置服务器业务域名成功"); - authorizerInfo.setWebdomainStatus(0); + authorizerInfo.setWebdomainStatus(EnumEnableType.SUCC.getCode()); authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } else { logger.info("设置服务器业务域名失败"); - authorizerInfo.setWebdomainStatus(1); + authorizerInfo.setWebdomainStatus(EnumEnableType.FAIL.getCode()); authorizerInfo.setWebdomainTime(new Date()); authorizerInfo.setUpdateTime(new Date()); } @@ -331,10 +333,10 @@ public class WxWeappInfoController extends BaseController { String versionRet = openMaService.setSupportVersion(weappBasicSet.getVersion()); logger.info(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 { - authorizerInfo.setBaseStatus(1); + authorizerInfo.setBaseStatus(EnumEnableType.FAIL.getCode()); } authorizerInfo.setBaseTime(new Date()); authorizerInfo.setUpdateTime(new Date()); @@ -361,11 +363,11 @@ public class WxWeappInfoController extends BaseController { @PostMapping("batchCodeCommit") public ResultData batchCodeCommit(@RequestBody Map params) { 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; Long templateId = null; @@ -436,9 +438,9 @@ public class WxWeappInfoController extends BaseController { int iAppType = 0; String appTypeStr = userVersion.substring(0, 1); - if(appTypeStr.equalsIgnoreCase("C")) + if(appTypeStr.equalsIgnoreCase(Constant.C)) iAppType = EnumAppType.C.getCode(); - else if(appTypeStr.equalsIgnoreCase("B")) + else if(appTypeStr.equalsIgnoreCase(Constant.B)) iAppType = EnumAppType.B.getCode(); if(!appinfo.getType().equals(iAppType)) { @@ -466,9 +468,9 @@ public class WxWeappInfoController extends BaseController { @PostMapping("batchCodeAudit") public ResultData batchCodeAudit(@RequestBody Map params) { 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; try { type = Integer.parseInt(typeStr); @@ -560,8 +562,8 @@ public class WxWeappInfoController extends BaseController { WxMaOpenCommitExtInfo extInfo = gson.fromJson(extSet.getExtJson(), new TypeToken() {}.getType()); 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()); WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appinfo.getAppId()); @@ -677,8 +679,8 @@ public class WxWeappInfoController extends BaseController { public ResultData batchAuditQuery(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchAuditQuery"); 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; try { type = Integer.parseInt(typeStr); @@ -736,8 +738,8 @@ public class WxWeappInfoController extends BaseController { public ResultData batchAuditCancel(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchAuditCancel"); 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; try { type = Integer.parseInt(typeStr); @@ -777,8 +779,8 @@ public class WxWeappInfoController extends BaseController { public ResultData batchRelease(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchRelease"); 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; try { type = Integer.parseInt(typeStr); @@ -827,7 +829,7 @@ public class WxWeappInfoController extends BaseController { if(releaseSuccess) { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); } else { - if(openRet.getErrcode().equals("85052")) { + if(openRet.getErrcode().equals(OpenConstant.ERR_CODE_APP_IS_RELEASED)) { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); } else { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); @@ -842,7 +844,7 @@ public class WxWeappInfoController extends BaseController { } } catch (WxErrorException e) { logger.error(e.getMessage()); - if(e.getError().getErrorCode() == 85052) { + if(e.getError().getErrorCode() == OpenConstant.ERR_APP_IS_RELEASED) { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); } else { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode());