diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappCodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappCodeController.java index c0d8b61d3..9350cebab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappCodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappCodeController.java @@ -1,5 +1,6 @@ package com.iformall.controller; +import com.alibaba.fastjson.JSON; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.service.wechat.WxOpenService; @@ -31,8 +32,9 @@ public class WechatWeappCodeController { private WxOpenService openService; @PostMapping("/codeCommit") - public ResultData codeCommit(Long templateId, String userVersion, String userDesc, WxMaOpenCommitExtInfo extInfo) { + public ResultData codeCommit(Long templateId, String userVersion, String userDesc, String extInfoStr) { try { + WxMaOpenCommitExtInfo extInfo = JSON.parseObject(extInfoStr, WxMaOpenCommitExtInfo.class); WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(extInfo.getExtAppid()); return new ResultData(openMaService.codeCommit(templateId, userVersion, userDesc, extInfo)) ; } catch (WxErrorException e) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappTemplateController.java index e8f50f04e..5eaf909d6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappTemplateController.java @@ -40,15 +40,4 @@ public class WechatWeappTemplateController { } return null; } - - @PostMapping("/codeCommit") - public ResultData codeCommit(String appId, Long templateId, String userVersion, String userDesc, WxMaOpenCommitExtInfo extInfo) { - try { - WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); - return new ResultData(openMaService.codeCommit(templateId, userVersion, userDesc, extInfo)) ; - } catch (WxErrorException e) { - logger.error(e.getMessage()); - } - return new ResultData(Result.ERROR); - } }