|
|
@@ -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()); |
|
|
|