| @@ -12,6 +12,9 @@ import com.iformall.domain.po.*; | |||||
| import com.iformall.domain.vo.WxWeappCodeStatusVo; | import com.iformall.domain.vo.WxWeappCodeStatusVo; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import com.iformall.service.toutiao.FmTtOpenService; | |||||
| import com.iformall.service.toutiao.api.TtOpenMaService; | |||||
| import com.iformall.service.toutiao.api.bean.TtOpenResult; | |||||
| import com.iformall.service.wechat.FmOpenService; | import com.iformall.service.wechat.FmOpenService; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| @@ -49,7 +52,7 @@ import java.util.Map; | |||||
| public class WechatWeappCodeController extends BaseController { | public class WechatWeappCodeController extends BaseController { | ||||
| private final Logger logger = LoggerFactory.getLogger(getClass()); | private final Logger logger = LoggerFactory.getLogger(getClass()); | ||||
| @Autowired | @Autowired | ||||
| private FmOpenService openService; | |||||
| private FmTtOpenService openService; | |||||
| @Autowired | @Autowired | ||||
| private WxWeappCodeStatusService weappCodeStatusService; | private WxWeappCodeStatusService weappCodeStatusService; | ||||
| @@ -99,9 +102,9 @@ public class WechatWeappCodeController extends BaseController { | |||||
| try { | try { | ||||
| // code提交 | // code提交 | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| logger.info(extInfo.toString()); | logger.info(extInfo.toString()); | ||||
| WxOpenResult openRet = openMaService.codeCommit(templateId, userVersion, userDesc, extInfo); | |||||
| TtOpenResult openRet = openMaService.codeCommit(templateId, userVersion, userDesc, extInfo); | |||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| boolean codeCommitStatus = false; | boolean codeCommitStatus = false; | ||||
| if (openRet.isSuccess()) { | if (openRet.isSuccess()) { | ||||
| @@ -172,7 +175,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| @RequestParam(value = "params", required = false) Map<String, String> params, | @RequestParam(value = "params", required = false) Map<String, String> params, | ||||
| HttpServletResponse response, HttpServletRequest req) { | HttpServletResponse response, HttpServletRequest req) { | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| File file = openMaService.getTestQrcode(pagePath, params); | File file = openMaService.getTestQrcode(pagePath, params); | ||||
| ServletOutputStream out = response.getOutputStream(); | ServletOutputStream out = response.getOutputStream(); | ||||
| @@ -205,7 +208,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| @GetMapping("/getCategory") | @GetMapping("/getCategory") | ||||
| public ResultData getCategory(String appId) { | public ResultData getCategory(String appId) { | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| WxOpenMaCategoryListResult openRet = openMaService.getCategoryList(); | WxOpenMaCategoryListResult openRet = openMaService.getCategoryList(); | ||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| return new ResultData(openRet); | return new ResultData(openRet); | ||||
| @@ -219,7 +222,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| @GetMapping("/getPage") | @GetMapping("/getPage") | ||||
| public ResultData getPage(String appId) { | public ResultData getPage(String appId) { | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| WxOpenMaPageListResult openRet = openMaService.getPageList(); | WxOpenMaPageListResult openRet = openMaService.getPageList(); | ||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| return new ResultData(openRet); | return new ResultData(openRet); | ||||
| @@ -252,20 +255,19 @@ public class WechatWeappCodeController extends BaseController { | |||||
| List<WxWeappCodeStatusVo> codeStatusList = weappCodeStatusService.getList(codeQ); | List<WxWeappCodeStatusVo> codeStatusList = weappCodeStatusService.getList(codeQ); | ||||
| if(codeStatusList.size() == 1) { | if(codeStatusList.size() == 1) { | ||||
| WxWeappCodeStatusVo codeStatus = codeStatusList.get(0); | WxWeappCodeStatusVo codeStatus = codeStatusList.get(0); | ||||
| WxOpenMaSubmitAuditMessage subMessage = gson.fromJson(extSet.getReleaseJson(), new TypeToken<WxOpenMaSubmitAuditMessage>() {}.getType()); | |||||
| if(codeStatus != null && codeStatus.getCodeStatus().equals(EnumWeappCodeCommitStatus.SUCCESS.getCode())) { | if(codeStatus != null && codeStatus.getCodeStatus().equals(EnumWeappCodeCommitStatus.SUCCESS.getCode())) { | ||||
| WxWeappAuditStatus auditStatus = weappAuditStatusService.getByAppId(appId); | WxWeappAuditStatus auditStatus = weappAuditStatusService.getByAppId(appId); | ||||
| boolean submitStatus = false; | boolean submitStatus = false; | ||||
| String codeErrCode = ""; | String codeErrCode = ""; | ||||
| Long auditId = null; | Long auditId = null; | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| TtOpenResult openRet = openMaService.submitAudit(); | |||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| if(openRet.isSuccess()) { | if(openRet.isSuccess()) { | ||||
| submitStatus = true; | submitStatus = true; | ||||
| codeErrCode = gson.toJson(openRet); | codeErrCode = gson.toJson(openRet); | ||||
| auditId = openRet.getAuditId(); | |||||
| // auditId = openRet.getAuditId(); | |||||
| } else { | } else { | ||||
| submitStatus = false; | submitStatus = false; | ||||
| codeErrCode = gson.toJson(openRet); | codeErrCode = gson.toJson(openRet); | ||||
| @@ -330,7 +332,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| public ResultData queryQuota(String appId) { | public ResultData queryQuota(String appId) { | ||||
| logger.debug("[" + getIpAddr() + "] WechatWeappCodeController::queryQuota"); | logger.debug("[" + getIpAddr() + "] WechatWeappCodeController::queryQuota"); | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| WxOpenMaQueryQuotaResult openRet = openMaService.queryQuota(); | WxOpenMaQueryQuotaResult openRet = openMaService.queryQuota(); | ||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| return new ResultData(openRet.toString()); | return new ResultData(openRet.toString()); | ||||
| @@ -373,13 +375,13 @@ public class WechatWeappCodeController extends BaseController { | |||||
| String codeErrCode = ""; | String codeErrCode = ""; | ||||
| Long auditId = null; | Long auditId = null; | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(codeAuditDto.getAppId()); | |||||
| WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(codeAuditDto.getAppId()); | |||||
| TtOpenResult openRet = openMaService.submitAudit(); | |||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| if(openRet.isSuccess()) { | if(openRet.isSuccess()) { | ||||
| submitStatus = true; | submitStatus = true; | ||||
| codeErrCode = gson.toJson(openRet); | codeErrCode = gson.toJson(openRet); | ||||
| auditId = openRet.getAuditId(); | |||||
| // auditId = openRet.getAuditId(); | |||||
| } else { | } else { | ||||
| submitStatus = false; | submitStatus = false; | ||||
| codeErrCode = gson.toJson(openRet); | codeErrCode = gson.toJson(openRet); | ||||
| @@ -447,7 +449,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| public ResultData speedAudit(String appId, Long auditid) { | public ResultData speedAudit(String appId, Long auditid) { | ||||
| logger.debug("[" + getIpAddr() + "] WechatWeappCodeController::speedAudit"); | logger.debug("[" + getIpAddr() + "] WechatWeappCodeController::speedAudit"); | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| Boolean ret = openMaService.speedAudit(Long.valueOf(auditid)); | Boolean ret = openMaService.speedAudit(Long.valueOf(auditid)); | ||||
| return new ResultData(ret.toString()); | return new ResultData(ret.toString()); | ||||
| } catch (WxErrorException e) { | } catch (WxErrorException e) { | ||||
| @@ -464,7 +466,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| WxWeappAuditStatus auditStatus = weappAuditStatusService.getByAppId(appId); | WxWeappAuditStatus auditStatus = weappAuditStatusService.getByAppId(appId); | ||||
| if(auditStatus != null && auditStatus.getAuditid().equals(auditId)) { | if(auditStatus != null && auditStatus.getAuditid().equals(auditId)) { | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| WxOpenMaQueryAuditResult openRet = openMaService.getAuditStatus(auditId); | WxOpenMaQueryAuditResult openRet = openMaService.getAuditStatus(auditId); | ||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| if (openRet.isSuccess()) { | if (openRet.isSuccess()) { | ||||
| @@ -508,7 +510,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| if(auditStatus != null | if(auditStatus != null | ||||
| && auditStatus.getAuditStatus().equals(EnumWeappAuditStatus.AUDITING.getCode())) { | && auditStatus.getAuditStatus().equals(EnumWeappAuditStatus.AUDITING.getCode())) { | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| WxOpenMaQueryAuditResult openRet = openMaService.getLatestAuditStatus(); | WxOpenMaQueryAuditResult openRet = openMaService.getLatestAuditStatus(); | ||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| if (openRet.isSuccess()) { | if (openRet.isSuccess()) { | ||||
| @@ -576,8 +578,8 @@ public class WechatWeappCodeController extends BaseController { | |||||
| releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); | releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); | ||||
| } | } | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| WxOpenResult openRet = openMaService.releaesAudited(); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| TtOpenResult openRet = openMaService.releaesAudited(); | |||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| boolean releaseSuccess = false; | boolean releaseSuccess = false; | ||||
| if(openRet.isSuccess()) { | if(openRet.isSuccess()) { | ||||
| @@ -586,11 +588,12 @@ public class WechatWeappCodeController extends BaseController { | |||||
| if(releaseSuccess) { | if(releaseSuccess) { | ||||
| releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); | releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); | ||||
| } else { | } else { | ||||
| if(openRet.getErrcode().equals("85052")) { // app is already released | |||||
| releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); | |||||
| } else { | |||||
| releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); | |||||
| } | |||||
| releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); | |||||
| // if(openRet.getErrcode().equals("85052")) { // app is already released | |||||
| // releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); | |||||
| // } else { | |||||
| // releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); | |||||
| // } | |||||
| } | } | ||||
| releaseStatus.setReleaseErrCode(gson.toJson(openRet)); | releaseStatus.setReleaseErrCode(gson.toJson(openRet)); | ||||
| releaseStatus.setReleaseTime(new Date()); | releaseStatus.setReleaseTime(new Date()); | ||||
| @@ -602,11 +605,13 @@ public class WechatWeappCodeController extends BaseController { | |||||
| return new ResultData(openRet); | return new ResultData(openRet); | ||||
| } catch (WxErrorException e) { | } catch (WxErrorException e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| if(e.getError().getErrorCode() == 85052) { | |||||
| releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); | |||||
| } else { | |||||
| releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); | |||||
| } | |||||
| releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); | |||||
| // if(e.getError().getErrorCode() == 85052) { | |||||
| // releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); | |||||
| // } else { | |||||
| // releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); | |||||
| // } | |||||
| releaseStatus.setReleaseErrCode(e.getMessage()); | releaseStatus.setReleaseErrCode(e.getMessage()); | ||||
| releaseStatus.setReleaseTime(new Date()); | releaseStatus.setReleaseTime(new Date()); | ||||
| if(isUpdate) { | if(isUpdate) { | ||||
| @@ -627,7 +632,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| Gson gson = new GsonBuilder().create(); | Gson gson = new GsonBuilder().create(); | ||||
| WxWeappReleaseStatus releaseStatus = weappReleaseStatusService.getByAppId(appId); | WxWeappReleaseStatus releaseStatus = weappReleaseStatusService.getByAppId(appId); | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| WxOpenResult openRet = openMaService.revertCodeReleaes(); | WxOpenResult openRet = openMaService.revertCodeReleaes(); | ||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| if(openRet.isSuccess()) { | if(openRet.isSuccess()) { | ||||
| @@ -650,7 +655,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| @GetMapping("/getSupportVersion") | @GetMapping("/getSupportVersion") | ||||
| public ResultData getSupportVersion(String appId) { | public ResultData getSupportVersion(String appId) { | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| String openRet = openMaService.getSupportVersion(); | String openRet = openMaService.getSupportVersion(); | ||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||
| return new ResultData(openRet); | return new ResultData(openRet); | ||||
| @@ -664,7 +669,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| @GetMapping("/setSupportVersion") | @GetMapping("/setSupportVersion") | ||||
| public ResultData setSupportVersion(String appId, String version) { | public ResultData setSupportVersion(String appId, String version) { | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| String openRet = openMaService.setSupportVersion(version); | String openRet = openMaService.setSupportVersion(version); | ||||
| logger.info(openRet); | logger.info(openRet); | ||||
| return new ResultData(openRet); | return new ResultData(openRet); | ||||
| @@ -681,7 +686,7 @@ public class WechatWeappCodeController extends BaseController { | |||||
| WxWeappAuditStatus auditStatus = weappAuditStatusService.getByAppId(appId); | WxWeappAuditStatus auditStatus = weappAuditStatusService.getByAppId(appId); | ||||
| if(auditStatus != null) { | if(auditStatus != null) { | ||||
| try { | try { | ||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||||
| TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); | |||||
| WxOpenResult openResult = openMaService.undoCodeAudit(); | WxOpenResult openResult = openMaService.undoCodeAudit(); | ||||
| Date curDate = new Date(); | Date curDate = new Date(); | ||||
| if(openResult.isSuccess()) { | if(openResult.isSuccess()) { | ||||