添加日志

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";
 }

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<Boolean> robotLogout(Integer robotId) {
+        return R.ok(weChatService.logoutByRobotId(robotId));
+    }
+
+
+
+
 }

admin/src/main/java/com/baiye/modules/distribute/service/WeChatService.java

@@ -113,6 +113,19 @@ public interface WeChatService extends ExtendService<WeChatAccount> {
     AccountStatisticsVO statisticsAccountByUserId(Long currentUserId);
 
 
+    /**
+     * 修改备注
+     * @param wxId
+     * @param remark
+     * @return
+     */
 
     Boolean updateRemarkByWechatId(String wxId, String remark);
+
+    /**
+     * 退出登录
+     * @param robotId
+     * @return
+     */
+    Boolean logoutByRobotId(Integer robotId);
 }

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<WeChatAccountMapper, We
         String getQrCodeResult = HttpUtil.get
                 (weChatProperties.getGatewayHost().concat(WeChatRequestConstants.GET_QR_CODE)
                         .concat(weChatProperties.getAppKey()), beanToMap);
+        log.info("=============== the response as {} =============", getQrCodeResult);
         if (StringUtils.isNotBlank(getQrCodeResult)) {
             WeChatResponse weChatResponse = JSONUtil.toBean(getQrCodeResult, WeChatResponse.class);
             return weChatResponse.getMsg();
@@ -114,6 +114,7 @@ public class WeChatServiceImpl extends ExtendServiceImpl<WeChatAccountMapper, We
         String createEquipmentResult = HttpUtil.get
                 (weChatProperties.getGatewayHost().concat(WeChatRequestConstants.CREATE_EQUIPMENT)
                         .concat(weChatProperties.getAppKey()), map);
+        log.info("=============== the response as {} =============", createEquipmentResult);
         if (StringUtils.isNotBlank(createEquipmentResult)) {
             WeChatResponse weChatResponse = JSONUtil.toBean(createEquipmentResult, WeChatResponse.class);
             if (weChatResponse.getStatus() == ResponseConstant.SUCCESS) {
@@ -151,6 +152,7 @@ public class WeChatServiceImpl extends ExtendServiceImpl<WeChatAccountMapper, We
         String pushQrCodeResult = HttpUtil.get
                 (weChatProperties.getGatewayHost().concat(WeChatRequestConstants.GET_PUSH_LOGIN)
                         .concat(weChatProperties.getAppKey()), beanToMap);
+        log.info("=============== the response as {} =============", pushQrCodeResult);
         if (StringUtils.isNotBlank(pushQrCodeResult)) {
             WeChatResponse weChatResponse = JSONUtil.toBean(pushQrCodeResult, WeChatResponse.class);
             return weChatResponse.getMsg();
@@ -285,7 +287,7 @@ public class WeChatServiceImpl extends ExtendServiceImpl<WeChatAccountMapper, We
 
         Long friendNum = wechatFriendService.queryByUserId(currentUserId);
         Integer abnormalNum = DefaultNumberConstants.ZERO_NUMBER;
-        Integer onlineNum = DefaultNumberConstants.ZERO_NUMBER;
+        int onlineNum = DefaultNumberConstants.ZERO_NUMBER;
         Map<String, Object> map = Maps.newHashMap();
         for (WeChatAccountVO weChatAccount : weChatAccounts) {
             map.put("robotId", weChatAccount.getRobotId());
@@ -315,4 +317,22 @@ public class WeChatServiceImpl extends ExtendServiceImpl<WeChatAccountMapper, We
         return this.baseMapper.updateRemark(wxId, remark);
     }
 
+    @Override
+    public Boolean logoutByRobotId(Integer robotId) {
+        List<Integer> arrayList = Lists.newArrayList(robotId);
+        Map<String, Object> 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;
+    }
+
 }