| @@ -268,45 +268,49 @@ public class WxWeappInfoController extends BaseController { | |||||
| WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId); | WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId); | ||||
| if(extSet != null) { | if(extSet != null) { | ||||
| boolean codeCommitStatus = false; | boolean codeCommitStatus = false; | ||||
| // code commit | |||||
| try { | |||||
| Gson gson= new GsonBuilder().create(); | |||||
| WxMaOpenCommitExtInfo extInfo = gson.fromJson(extSet.getExtJson(), new TypeToken<WxMaOpenCommitExtInfo>() { }.getType()); | |||||
| logger.info(extInfo.toString()); | |||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(extInfo.getExtAppid()); | |||||
| WxOpenResult openRet = openMaService.codeCommit(templateId, userVersion, userDesc, extInfo); | |||||
| logger.info(openRet.toString()); | |||||
| if(openRet.isSuccess()) { | |||||
| codeCommitStatus = true; | |||||
| } | |||||
| if(codeStatus == null) { | |||||
| WxAppinfo appinfo = appinfoService.getByAppId(appId); | |||||
| codeStatus = new WxWeappCodeStatus(); | |||||
| codeStatus.setAppId(appId); | |||||
| if(appinfo != null) { | |||||
| codeStatus.setType(appinfo.getType()); | |||||
| if(codeStatus != null && codeStatus.getCodeStatus().equals(0)) { | |||||
| codeCommitStatus = true; | |||||
| } | |||||
| if(!codeCommitStatus) { | |||||
| // code提交 | |||||
| try { | |||||
| Gson gson = new GsonBuilder().create(); | |||||
| WxMaOpenCommitExtInfo extInfo = gson.fromJson(extSet.getExtJson(), new TypeToken<WxMaOpenCommitExtInfo>() {}.getType()); | |||||
| logger.info(extInfo.toString()); | |||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(extInfo.getExtAppid()); | |||||
| WxOpenResult openRet = openMaService.codeCommit(templateId, userVersion, userDesc, extInfo); | |||||
| logger.info(openRet.toString()); | |||||
| if (openRet.isSuccess()) { | |||||
| codeCommitStatus = true; | |||||
| } | } | ||||
| codeStatus.setUserVersion(userVersion); | |||||
| codeStatus.setVersionDesc(userDesc); | |||||
| codeStatus.setCodeStatus(Integer.valueOf(openRet.getErrcode())); | |||||
| codeStatus.setCodeTime(new Date()); | |||||
| weappCodeStatusService.saveOrUpdate(codeStatus); | |||||
| } else { | |||||
| codeStatus.setUserVersion(userVersion); | |||||
| codeStatus.setVersionDesc(userDesc); | |||||
| codeStatus.setCodeStatus(Integer.valueOf(openRet.getErrcode())); | |||||
| codeStatus.setCodeTime(new Date()); | |||||
| weappCodeStatusService.updateCodeCommitStatus(codeStatus); | |||||
| if (codeStatus == null) { | |||||
| WxAppinfo appinfo = appinfoService.getByAppId(appId); | |||||
| codeStatus = new WxWeappCodeStatus(); | |||||
| codeStatus.setAppId(appId); | |||||
| if (appinfo != null) { | |||||
| codeStatus.setType(appinfo.getType()); | |||||
| } | |||||
| codeStatus.setUserVersion(userVersion); | |||||
| codeStatus.setVersionDesc(userDesc); | |||||
| codeStatus.setCodeStatus(Integer.valueOf(openRet.getErrcode())); | |||||
| codeStatus.setCodeTime(new Date()); | |||||
| weappCodeStatusService.saveOrUpdate(codeStatus); | |||||
| } else { | |||||
| codeStatus.setUserVersion(userVersion); | |||||
| codeStatus.setVersionDesc(userDesc); | |||||
| codeStatus.setCodeStatus(Integer.valueOf(openRet.getErrcode())); | |||||
| codeStatus.setCodeTime(new Date()); | |||||
| weappCodeStatusService.updateCodeCommitStatus(codeStatus); | |||||
| } | |||||
| } catch (WxErrorException e) { | |||||
| logger.error(e.getMessage()); | |||||
| } | } | ||||
| } catch (WxErrorException e) { | |||||
| logger.error(e.getMessage()); | |||||
| } | } | ||||
| // 提交审核 | // 提交审核 | ||||
| if(codeCommitStatus) { | if(codeCommitStatus) { | ||||
| try { | try { | ||||
| Gson gson= new GsonBuilder().create(); | Gson gson= new GsonBuilder().create(); | ||||
| WxOpenMaSubmitAuditMessage subMessage = gson.fromJson(extSet.getReleaseJson(), new TypeToken<WxOpenMaSubmitAuditMessage>() { }.getType()); | |||||
| logger.info(extSet.getReleaseJson().toString()); | |||||
| WxOpenMaSubmitAuditMessage subMessage = gson.fromJson(extSet.getReleaseJson(), new TypeToken<WxOpenMaSubmitAuditMessage>() {}.getType()); | |||||
| logger.info(subMessage.toString()); | logger.info(subMessage.toString()); | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | ||||
| WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage); | WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage); | ||||