|
|
|
@@ -305,7 +305,6 @@ public class WechatWeappCodeController { |
|
|
|
break; |
|
|
|
case 1: |
|
|
|
auditStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode()); |
|
|
|
auditStatus.setAuditErrCode(gson.toJson(openRet)); |
|
|
|
break; |
|
|
|
case 2: |
|
|
|
auditStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); |
|
|
|
@@ -317,6 +316,7 @@ public class WechatWeappCodeController { |
|
|
|
auditStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); |
|
|
|
break; |
|
|
|
} |
|
|
|
auditStatus.setAuditErrCode(gson.toJson(openRet)); |
|
|
|
auditStatus.setAuditTime(new Date()); |
|
|
|
weappAuditStatusService.updateStatus(auditStatus); |
|
|
|
} |
|
|
|
@@ -349,7 +349,6 @@ public class WechatWeappCodeController { |
|
|
|
break; |
|
|
|
case 1: |
|
|
|
auditStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode()); |
|
|
|
auditStatus.setAuditErrCode(gson.toJson(openRet)); |
|
|
|
break; |
|
|
|
case 2: |
|
|
|
auditStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); |
|
|
|
@@ -361,6 +360,7 @@ public class WechatWeappCodeController { |
|
|
|
auditStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); |
|
|
|
break; |
|
|
|
} |
|
|
|
auditStatus.setAuditErrCode(gson.toJson(openRet)); |
|
|
|
auditStatus.setAuditTime(new Date()); |
|
|
|
weappAuditStatusService.updateStatus(auditStatus); |
|
|
|
} |
|
|
|
@@ -387,6 +387,8 @@ public class WechatWeappCodeController { |
|
|
|
&& releaseStatus.getReleaseStatus().equals(EnumWeappReleaseStatus.SUCCESS.getCode())) { |
|
|
|
return new ResultData(ErrorCode.WEAPP_APP_RELEASEED); |
|
|
|
} |
|
|
|
releaseStatus.setUserVersion(auditStatus.getUserVersion()); |
|
|
|
releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); |
|
|
|
} else { |
|
|
|
releaseStatus = new WxWeappReleaseStatus(); |
|
|
|
releaseStatus.setAppId(auditStatus.getAppId()); |
|
|
|
@@ -400,18 +402,18 @@ public class WechatWeappCodeController { |
|
|
|
logger.info(openRet.toString()); |
|
|
|
if(openRet.getErrcode().equals('0')) { |
|
|
|
releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); |
|
|
|
releaseStatus.setReleaseTime(new Date()); |
|
|
|
} else { |
|
|
|
releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); |
|
|
|
releaseStatus.setReleaseErrCode(gson.toJson(openRet)); |
|
|
|
releaseStatus.setReleaseTime(new Date()); |
|
|
|
} |
|
|
|
releaseStatus.setReleaseErrCode(gson.toJson(openRet)); |
|
|
|
releaseStatus.setReleaseTime(new Date()); |
|
|
|
weappReleaseStatusService.saveStatus(releaseStatus); |
|
|
|
return new ResultData(openRet); |
|
|
|
} catch (WxErrorException e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); |
|
|
|
releaseStatus.setReleaseErrCode(e.getMessage()); |
|
|
|
releaseStatus.setReleaseTime(new Date()); |
|
|
|
weappReleaseStatusService.updateStatus(releaseStatus); |
|
|
|
return new ResultData(Result.ERROR, e.getMessage()); |
|
|
|
} |
|
|
|
@@ -423,6 +425,7 @@ public class WechatWeappCodeController { |
|
|
|
@ApiOperation("小程序版本回退") |
|
|
|
@GetMapping("/revertCodeRelease") |
|
|
|
public ResultData revertCodeRelease(String appId) { |
|
|
|
Gson gson = new GsonBuilder().create(); |
|
|
|
WxWeappReleaseStatus releaseStatus = weappReleaseStatusService.getByAppId(appId); |
|
|
|
try { |
|
|
|
WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); |
|
|
|
@@ -431,6 +434,7 @@ public class WechatWeappCodeController { |
|
|
|
if(openRet.isSuccess()) { |
|
|
|
if(releaseStatus != null) { |
|
|
|
releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.BACK.getCode()); |
|
|
|
releaseStatus.setReleaseErrCode(gson.toJson(openRet)); |
|
|
|
releaseStatus.setReleaseTime(new Date()); |
|
|
|
weappReleaseStatusService.updateStatus(releaseStatus); |
|
|
|
} |
|
|
|
@@ -439,11 +443,6 @@ public class WechatWeappCodeController { |
|
|
|
return new ResultData(openRet); |
|
|
|
} catch (WxErrorException e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
if(releaseStatus != null) { |
|
|
|
releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); |
|
|
|
releaseStatus.setReleaseErrCode(e.getMessage()); |
|
|
|
weappReleaseStatusService.updateStatus(releaseStatus); |
|
|
|
} |
|
|
|
return new ResultData(Result.ERROR, e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
|