|
|
|
@@ -6,6 +6,7 @@ import com.google.gson.reflect.TypeToken; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.dto.WxWeappCodeAuditDto; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.vo.WxWeappCodeStatusVo; |
|
|
|
import com.iformall.enums.*; |
|
|
|
@@ -225,7 +226,7 @@ public class WechatWeappCodeController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("将第三方提交的代码包提交审核") |
|
|
|
@ApiOperation("将第三方提交的代码包提交审核 -- 即将废弃") |
|
|
|
@GetMapping("/submitAudit") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true), |
|
|
|
@@ -316,6 +317,100 @@ public class WechatWeappCodeController { |
|
|
|
return new ResultData(ErrorCode.WEAPP_CODE_COMMIT_ERR); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("将第三方提交的代码包提交审核") |
|
|
|
@PostMapping("/submitAuditWithFeedBack") |
|
|
|
public ResultData submitAudit(@RequestBody WxWeappCodeAuditDto codeAuditDto) { |
|
|
|
Gson gson = new GsonBuilder().create(); |
|
|
|
WxWeappExtSet extSetQ = new WxWeappExtSet(); |
|
|
|
extSetQ.setAppId(codeAuditDto.getAppId()); |
|
|
|
WxWeappExtSet extSet = weappExtSetService.getByObj(extSetQ); |
|
|
|
if(StringUtils.isBlank(extSet.getReleaseJson())) { |
|
|
|
logger.error("Release JSON is null"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
} |
|
|
|
|
|
|
|
WxWeappCodeStatusVo codeQ = new WxWeappCodeStatusVo(); |
|
|
|
codeQ.setAppId(codeAuditDto.getAppId()); |
|
|
|
if(StringUtils.isNotBlank(codeAuditDto.getVersion())) { |
|
|
|
codeQ.setUserVersion(codeAuditDto.getVersion()); |
|
|
|
} |
|
|
|
List<WxWeappCodeStatusVo> codeStatusList = weappCodeStatusService.getList(codeQ); |
|
|
|
if(codeStatusList.size() == 1) { |
|
|
|
WxWeappCodeStatusVo codeStatus = codeStatusList.get(0); |
|
|
|
WxOpenMaSubmitAuditMessage subMessage = gson.fromJson(extSet.getReleaseJson(), new TypeToken<WxOpenMaSubmitAuditMessage>() {}.getType()); |
|
|
|
if(StringUtils.isNotBlank(codeAuditDto.getFeedbackInfo())) { |
|
|
|
subMessage.setFeedbackInfo(codeAuditDto.getFeedbackInfo()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(codeAuditDto.getFeedbackStuff())) { |
|
|
|
subMessage.setFeedbackStuff(codeAuditDto.getFeedbackStuff()); |
|
|
|
} |
|
|
|
if(codeStatus != null && codeStatus.getCodeStatus().equals(EnumWeappCodeCommitStatus.SUCCESS.getCode())) { |
|
|
|
WxWeappAuditStatus auditStatus = weappAuditStatusService.getByAppId(codeAuditDto.getAppId()); |
|
|
|
boolean submitStatus = false; |
|
|
|
String codeErrCode = ""; |
|
|
|
try { |
|
|
|
WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(codeAuditDto.getAppId()); |
|
|
|
WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage); |
|
|
|
logger.info(openRet.toString()); |
|
|
|
if(openRet.isSuccess()) { |
|
|
|
submitStatus = true; |
|
|
|
codeErrCode = gson.toJson(openRet); |
|
|
|
} else { |
|
|
|
submitStatus = false; |
|
|
|
codeErrCode = gson.toJson(openRet); |
|
|
|
} |
|
|
|
} catch (WxErrorException e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
submitStatus = false; |
|
|
|
codeErrCode = e.getMessage(); |
|
|
|
} |
|
|
|
|
|
|
|
if (auditStatus == null) { |
|
|
|
auditStatus = new WxWeappAuditStatus(); |
|
|
|
auditStatus.setId(codeStatus.getId()); |
|
|
|
auditStatus.setTenantId(codeStatus.getTenantId()); |
|
|
|
auditStatus.setAppId(codeStatus.getAppId()); |
|
|
|
auditStatus.setType(codeStatus.getType()); |
|
|
|
auditStatus.setUserVersion(codeStatus.getUserVersion()); |
|
|
|
auditStatus.setVersionDesc(codeStatus.getVersionDesc()); |
|
|
|
if(submitStatus) { |
|
|
|
auditStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); |
|
|
|
} else { |
|
|
|
auditStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode()); |
|
|
|
} |
|
|
|
auditStatus.setAuditErrCode(codeErrCode); |
|
|
|
auditStatus.setAuditTime(new Date()); |
|
|
|
weappAuditStatusService.saveStatus(auditStatus); |
|
|
|
} else { |
|
|
|
if(!submitStatus) { |
|
|
|
if(!auditStatus.getUserVersion().equals(codeStatus.getUserVersion()) |
|
|
|
&& auditStatus.getAuditStatus().equals(EnumWeappAuditStatus.AUDITING.getCode())) { |
|
|
|
// 提交审核失败不替换当前审核中的数据 |
|
|
|
return new ResultData(ErrorCode.WEAPP_HAD_AUDITING); |
|
|
|
} |
|
|
|
codeStatus.setCodeStatus(EnumWeappAuditStatus.FAIL.getCode()); |
|
|
|
codeStatus.setCodeErrCode(codeErrCode); |
|
|
|
} else { |
|
|
|
codeStatus.setCodeStatus(EnumWeappAuditStatus.AUDITING.getCode()); |
|
|
|
} |
|
|
|
auditStatus.setUserVersion(codeStatus.getUserVersion()); |
|
|
|
auditStatus.setVersionDesc(codeStatus.getVersionDesc()); |
|
|
|
auditStatus.setAuditTime(new Date()); |
|
|
|
weappAuditStatusService.updateStatus(auditStatus); |
|
|
|
} |
|
|
|
if(submitStatus) { |
|
|
|
return new ResultData(codeErrCode); |
|
|
|
} else { |
|
|
|
return new ResultData(ErrorCode.WEAPP_AUDIT_ERR); |
|
|
|
} |
|
|
|
} else { |
|
|
|
logger.error(ErrorCode.WEAPP_CODE_COMMIT_ERR.getMessage()); |
|
|
|
return new ResultData(ErrorCode.WEAPP_CODE_COMMIT_ERR); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(ErrorCode.WEAPP_CODE_COMMIT_ERR); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("查询某个指定版本的审核状态") |
|
|
|
@PostMapping("/getAuditstatus") |
|
|
|
public ResultData getAuditstatus(String appId, String auditidStr) { |
|
|
|
|