From 23554c80f67ef10170d6a93f8046a477e69f3371 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Thu, 11 Apr 2024 18:08:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/WeChatRequestConstants.java | 55 ------------------- .../controller/WeChatController.java | 13 +++++ .../distribute/service/WeChatService.java | 13 +++++ .../service/impl/WeChatServiceImpl.java | 24 +++++++- 4 files changed, 48 insertions(+), 57 deletions(-) diff --git a/admin/src/main/java/com/baiye/constant/WeChatRequestConstants.java b/admin/src/main/java/com/baiye/constant/WeChatRequestConstants.java index 0b77805..6675028 100644 --- a/admin/src/main/java/com/baiye/constant/WeChatRequestConstants.java +++ b/admin/src/main/java/com/baiye/constant/WeChatRequestConstants.java @@ -48,65 +48,10 @@ public interface WeChatRequestConstants { - /** - * 退出微信 - */ - String WE_CHAT_LOGOUT = "/wechat/v1/batchLogout"; - - /** - * 发送文本消息 - */ - String WE_CHAT_SEND_TXT = "/wechat/v1/sendtext"; - - /** - * 发送图片 - */ - String WE_CHAT_SEND_PICTURE = "/wechat/v1/sendurlpic"; - /** - * 发送gif - */ - String WE_CHAT_SEND_GIF = "/wechat/v1/sendGif"; - - /** - * 发送视频 - */ - String WE_CHAT_SEND_VIDEO = "/wechat/v1/sendCdnVideoMsg"; - - /** - * 获取好友信息 - */ - String WE_CHAT_FRIEND_INFORMATION = "/wechat/v1/friendinfo"; - - /** - * 获取通讯录信息 - */ - String WE_CHAT_GET_CONTACT = "/wechat/v1/getAllContact"; - /** - * 同步通讯录 - */ - String WE_CHAT_SYNC_CONTACT = "/wechat/v1/syncContact"; /** * 添加好友 */ String WE_CHAT_ADD_FRIEND = "/api/add-now-friend-phone/"; - /** - * 在线状态检测 - */ - String WE_CHAT_STATUS = "/wechat/v1/wecatstatus"; - - /** - * 发送文本消息 - */ - String WE_SEND_TEXT = "/wechat/v1/sendtext"; - - /** - * 发送图片 - */ - String WE_SEND_PIC = "/wechat/v1/sendurlpic"; - /** - * 发生gif - */ - String WE_SEND_GIF = "/wechat/v1/sendGif"; } diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/WeChatController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/WeChatController.java index bb5bb6d..25e0492 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/WeChatController.java +++ b/admin/src/main/java/com/baiye/modules/distribute/controller/WeChatController.java @@ -1,5 +1,7 @@ package com.baiye.modules.distribute.controller; +import cn.hutool.http.HttpUtil; +import com.baiye.constant.WeChatRequestConstants; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; import com.baiye.modules.distribute.dto.CreateCodeDTO; @@ -15,6 +17,7 @@ import com.baiye.modules.distribute.vo.StatisticsFriendVO; import com.baiye.modules.distribute.vo.WeChatAccountVO; import com.baiye.result.R; import com.baiye.security.util.SecurityUtils; +import com.google.common.collect.Maps; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.Data; @@ -24,6 +27,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.List; +import java.util.Map; /** * @author Enzo @@ -117,4 +121,13 @@ public class WeChatController { } + @GetMapping("/robot/logout") + @Operation(summary = "退出登录") + public R robotLogout(Integer robotId) { + return R.ok(weChatService.logoutByRobotId(robotId)); + } + + + + } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/WeChatService.java b/admin/src/main/java/com/baiye/modules/distribute/service/WeChatService.java index 31eda54..74c861f 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/WeChatService.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/WeChatService.java @@ -113,6 +113,19 @@ public interface WeChatService extends ExtendService { AccountStatisticsVO statisticsAccountByUserId(Long currentUserId); + /** + * 修改备注 + * @param wxId + * @param remark + * @return + */ Boolean updateRemarkByWechatId(String wxId, String remark); + + /** + * 退出登录 + * @param robotId + * @return + */ + Boolean logoutByRobotId(Integer robotId); } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java index d41693b..6e622d3 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java @@ -45,7 +45,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -81,6 +80,7 @@ public class WeChatServiceImpl extends ExtendServiceImpl map = Maps.newHashMap(); for (WeChatAccountVO weChatAccount : weChatAccounts) { map.put("robotId", weChatAccount.getRobotId()); @@ -315,4 +317,22 @@ public class WeChatServiceImpl extends ExtendServiceImpl arrayList = Lists.newArrayList(robotId); + Map map = Maps.newHashMap(); + map.put("robotIds", arrayList); + String result = HttpUtil.post + (weChatProperties.getGatewayHost().concat(WeChatRequestConstants.ROBOT_LOGOUT) + .concat(weChatProperties.getAppKey()), map); + log.info("=============== the response as {} =============", result); + if (StringUtils.isNotBlank(result) && result.contains(ResponseCode.SUCCESS.getDesc())) { + WeChatResponse weChatResponse = JSONUtil.toBean(result, WeChatResponse.class); + if (weChatResponse.getStatus() == HttpStatus.HTTP_OK) { + return Boolean.TRUE; + } + } + return Boolean.FALSE; + } + }