From bee9cda49782be8fb3398995ce569169fcca7b91 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 24 Dec 2018 17:11:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=B9=B3=E5=8F=B0][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=A8=A1=E6=9D=BF=E5=8F=8A=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WechatWeappCodeController.java | 4 +++- .../controller/WechatWeappTemplateController.java | 11 ----------- 2 files changed, 3 insertions(+), 12 deletions(-) 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); - } }