From e93a90776ffc9cf274e2f8e5ae78ab37e0bd107d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sat, 6 Apr 2019 22:39:32 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=89=B9=E6=80=A7=E3=80=82=E6=94=AF=E6=8C=81=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E8=8F=9C=E5=8D=95=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/openfeign/PigxFeignFallback.java | 2 +- .../pigx/mp/controller/WxMenuController.java | 6 +++++ .../pigx/mp/service/WxMenuService.java | 7 ++++++ .../mp/service/impl/WxMenuServiceImpl.java | 24 +++++++++++++++++++ 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java b/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java index 21d7c9ff1..18a39a96c 100644 --- a/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java +++ b/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java @@ -45,7 +45,7 @@ public class PigxFeignFallback implements MethodInterceptor { @Nullable @Override - public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable { + public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) { Class returnType = method.getReturnType(); if (R.class != returnType) { return null; diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java index 978264153..a440953ff 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java @@ -91,4 +91,10 @@ public class WxMenuController { return wxMenuService.push(appId); } + @DeleteMapping("/{appId}") + public R delete(@PathVariable("appId") String appId) { + return wxMenuService.delete(appId); + } + + } diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/WxMenuService.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/WxMenuService.java index 967ac499e..2ac0956a3 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/WxMenuService.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/WxMenuService.java @@ -53,4 +53,11 @@ public interface WxMenuService extends IService { * @return */ R getByAppId(String appId); + + /** + * 通过appid 删除菜单 + * @param appId + * @return + */ + R delete(String appId); } diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMenuServiceImpl.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMenuServiceImpl.java index b78b8e8ef..0d0a75370 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMenuServiceImpl.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxMenuServiceImpl.java @@ -134,4 +134,28 @@ public class WxMenuServiceImpl extends ServiceImpl imple } return R.builder().data(wxMpMenuList.get(0).getMenu()).build(); } + + /** + * 通过appid 删除菜单 + * + * @param appId + * @return + */ + @Override + public R delete(String appId) { + WxMpService wxMpService = WxMpConfiguration.getMpServices().get(appId); + WxMpMenuService menuService = wxMpService.getMenuService(); + try { + menuService.menuDelete(); + } catch (WxErrorException e) { + log.error("微信菜单删除失败", e.getError().getErrorMsg()); + return R.builder() + .code(CommonConstants.FAIL) + .msg(e.getError().getErrorMsg()).build(); + } + + baseMapper.delete(Wrappers.lambdaQuery() + .eq(WxMpMenu::getWxAccountAppid, appId)); + return R.builder().build(); + } }