add callback api

api-module/src/main/java/com/tzld/piaoquan/api/controller/MessageController.java → api-module/src/main/java/com/tzld/piaoquan/api/controller/wecom/MessageController.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.api.controller;
+package com.tzld.piaoquan.api.controller.wecom;
 
 
 import com.tzld.piaoquan.growth.common.common.base.CommonResponse;

api-module/src/main/java/com/tzld/piaoquan/api/controller/TencentWeComController.java → api-module/src/main/java/com/tzld/piaoquan/api/controller/wecom/TencentWeComController.java

@@ -1,20 +1,17 @@
-package com.tzld.piaoquan.api.controller;
+package com.tzld.piaoquan.api.controller.wecom;
 
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.growth.common.model.vo.SendRequestParam;
-import com.tzld.piaoquan.api.service.WeComAutoReply;
+import com.tzld.piaoquan.api.service.wecom.WeComAutoReply;
 import com.tzld.piaoquan.growth.common.common.constant.WeComServerConstant;
 import com.tzld.piaoquan.growth.common.component.HttpPoolClient;
+import com.tzld.piaoquan.growth.common.model.vo.SendRequestParam;
 import com.tzld.piaoquan.growth.common.service.WeComUserService;
 import com.tzld.piaoquan.growth.common.utils.wecom.WXBizMsgCrypt;
 import com.tzld.piaoquan.growth.common.utils.wecom.WxUtil;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;

api-module/src/main/java/com/tzld/piaoquan/api/controller/ThirdPartyController.java → api-module/src/main/java/com/tzld/piaoquan/api/controller/wecom/ThirdPartyController.java

@@ -1,10 +1,10 @@
-package com.tzld.piaoquan.api.controller;
+package com.tzld.piaoquan.api.controller.wecom;
 
 
 import com.tzld.piaoquan.api.model.vo.*;
 import com.tzld.piaoquan.api.mq.MessageCallbackProducer;
 import com.tzld.piaoquan.api.service.GhAccessTokenService;
-import com.tzld.piaoquan.api.service.ThirdPartyService;
+import com.tzld.piaoquan.api.service.wecom.ThirdPartyService;
 import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

api-module/src/main/java/com/tzld/piaoquan/api/controller/WeComController.java → api-module/src/main/java/com/tzld/piaoquan/api/controller/wecom/WeComController.java

@@ -1,8 +1,8 @@
-package com.tzld.piaoquan.api.controller;
+package com.tzld.piaoquan.api.controller.wecom;
 
 import com.tzld.piaoquan.api.model.vo.WeComPushMessageParam;
 import com.tzld.piaoquan.api.model.vo.WeComPushMessageVo;
-import com.tzld.piaoquan.api.service.WeComService;
+import com.tzld.piaoquan.api.service.wecom.WeComService;
 import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

api-module/src/main/java/com/tzld/piaoquan/api/controller/WeComUserController.java → api-module/src/main/java/com/tzld/piaoquan/api/controller/wecom/WeComUserController.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.api.controller;
+package com.tzld.piaoquan.api.controller.wecom;
 
 import com.tzld.piaoquan.api.model.vo.WeComUserNameAvatarParam;
 import com.tzld.piaoquan.growth.common.common.base.CommonResponse;

api-module/src/main/java/com/tzld/piaoquan/api/controller/wecom/thirdpart/WeComThirdPartyCallBackController.java

@@ -0,0 +1,26 @@
+package com.tzld.piaoquan.api.controller.wecom.thirdpart;
+
+import com.alibaba.fastjson.JSONObject;
+import com.tzld.piaoquan.api.service.wecom.thirdparty.WeComThirdPartyCallBackService;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/wecom/thirdparty")
+public class WeComThirdPartyCallBackController {
+
+    @Autowired
+    private WeComThirdPartyCallBackService service;
+
+    @PostMapping("/callback")
+    public CommonResponse<String> callback(@RequestBody JSONObject param) {
+        service.handleCallback(param);
+        return CommonResponse.success();
+    }
+}

api-module/src/main/java/com/tzld/piaoquan/api/controller/WeComThirdPartyController.java → api-module/src/main/java/com/tzld/piaoquan/api/controller/wecom/thirdpart/WeComThirdPartyController.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.api.controller;
+package com.tzld.piaoquan.api.controller.wecom.thirdpart;
 
 import com.tzld.piaoquan.api.model.param.wecom.thirdpart.*;
-import com.tzld.piaoquan.api.service.WeComThirdPartyService;
+import com.tzld.piaoquan.api.service.wecom.thirdparty.WeComThirdPartyService;
 import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

api-module/src/main/java/com/tzld/piaoquan/api/job/wecom/thirdpart/WeComAccountJob.java

@@ -7,7 +7,7 @@ import com.tzld.piaoquan.api.model.param.wecom.thirdpart.CommonResponse;
 import com.tzld.piaoquan.api.model.param.wecom.thirdpart.LoginInfo;
 import com.tzld.piaoquan.api.model.param.wecom.thirdpart.UuidRequest;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComStaff;
-import com.tzld.piaoquan.api.service.WeComThirdPartyService;
+import com.tzld.piaoquan.api.service.wecom.thirdparty.WeComThirdPartyService;
 import com.tzld.piaoquan.growth.common.utils.LarkRobotUtil;
 import com.tzld.piaoquan.growth.common.utils.RedisUtils;
 import com.xxl.job.core.biz.model.ReturnT;

api-module/src/main/java/com/tzld/piaoquan/api/job/wecom/thirdpart/WeComCreateRoomJob.java

@@ -9,7 +9,7 @@ import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComRoom;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComRoomUser;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComStaff;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComStaffUser;
-import com.tzld.piaoquan.api.service.WeComThirdPartyService;
+import com.tzld.piaoquan.api.service.wecom.thirdparty.WeComThirdPartyService;
 import com.tzld.piaoquan.growth.common.utils.DateUtil;
 import com.tzld.piaoquan.growth.common.utils.RedisUtils;
 import com.xxl.job.core.biz.model.ReturnT;

api-module/src/main/java/com/tzld/piaoquan/api/job/wecom/thirdpart/WeComSendMsgJob.java

@@ -16,7 +16,7 @@ import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComMsgExample;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComRoom;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComStaff;
 import com.tzld.piaoquan.api.model.vo.contentplatform.WxVideoV2VO;
-import com.tzld.piaoquan.api.service.WeComThirdPartyService;
+import com.tzld.piaoquan.api.service.wecom.thirdparty.WeComThirdPartyService;
 import com.tzld.piaoquan.api.util.CdnUtil;
 import com.tzld.piaoquan.growth.common.model.po.CgiReplyBucketData;
 import com.tzld.piaoquan.growth.common.model.po.Staff;

api-module/src/main/java/com/tzld/piaoquan/api/job/wecom/thirdpart/WeComUserDetailJob.java

@@ -12,7 +12,7 @@ import com.tzld.piaoquan.api.dao.mapper.wecom.thirdpart.ThirdPartWeComStaffUserM
 import com.tzld.piaoquan.api.dao.mapper.wecom.thirdpart.ext.ThirdPartWeComMapperExt;
 import com.tzld.piaoquan.api.model.param.wecom.thirdpart.*;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.*;
-import com.tzld.piaoquan.api.service.WeComThirdPartyService;
+import com.tzld.piaoquan.api.service.wecom.thirdparty.WeComThirdPartyService;
 import com.tzld.piaoquan.growth.common.utils.RedisUtils;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;

api-module/src/main/java/com/tzld/piaoquan/api/service/ThirdPartyService.java → api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/ThirdPartyService.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.api.service;
+package com.tzld.piaoquan.api.service.wecom;
 
 
 import com.tzld.piaoquan.api.model.vo.PushMessageParam;

api-module/src/main/java/com/tzld/piaoquan/api/service/WeComAutoReply.java → api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/WeComAutoReply.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.api.service;
+package com.tzld.piaoquan.api.service.wecom;
 
 public interface WeComAutoReply {
 

api-module/src/main/java/com/tzld/piaoquan/api/service/WeComService.java → api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/WeComService.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.api.service;
+package com.tzld.piaoquan.api.service.wecom;
 
 
 

api-module/src/main/java/com/tzld/piaoquan/api/service/impl/ThirdPartyServiceImpl.java → api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/impl/ThirdPartyServiceImpl.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.api.service.impl;
+package com.tzld.piaoquan.api.service.wecom.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -13,7 +13,7 @@ import com.tzld.piaoquan.api.model.vo.PushMessageParam;
 import com.tzld.piaoquan.api.model.vo.PushMessageVo;
 import com.tzld.piaoquan.api.model.vo.ReportUvVo;
 import com.tzld.piaoquan.api.service.GhAccessTokenService;
-import com.tzld.piaoquan.api.service.ThirdPartyService;
+import com.tzld.piaoquan.api.service.wecom.ThirdPartyService;
 import com.tzld.piaoquan.api.service.strategy.ReplyStrategyService;
 import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import com.tzld.piaoquan.growth.common.common.constant.TimeConstant;

api-module/src/main/java/com/tzld/piaoquan/api/service/impl/WeComAutoReplyImpl.java → api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/impl/WeComAutoReplyImpl.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.api.service.impl;
+package com.tzld.piaoquan.api.service.wecom.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -6,8 +6,8 @@ import com.tzld.piaoquan.api.dao.mapper.AutoReplyMsgSendRecordMapper;
 import com.tzld.piaoquan.api.model.bo.MsgData;
 import com.tzld.piaoquan.api.model.po.AutoReplyMsgSendRecord;
 import com.tzld.piaoquan.api.model.vo.WeComPushMessageVo;
-import com.tzld.piaoquan.api.service.WeComAutoReply;
-import com.tzld.piaoquan.api.service.WeComService;
+import com.tzld.piaoquan.api.service.wecom.WeComAutoReply;
+import com.tzld.piaoquan.api.service.wecom.WeComService;
 import com.tzld.piaoquan.growth.common.component.HttpPoolClient;
 import com.tzld.piaoquan.growth.common.dao.mapper.CorpMapper;
 import com.tzld.piaoquan.growth.common.model.bo.MsgResult;
@@ -20,11 +20,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Random;
 
 @Slf4j

api-module/src/main/java/com/tzld/piaoquan/api/service/impl/WeComServiceImpl.java → api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/impl/WeComServiceImpl.java

@@ -1,9 +1,8 @@
-package com.tzld.piaoquan.api.service.impl;
+package com.tzld.piaoquan.api.service.wecom.impl;
 
 import com.alibaba.fastjson.JSON;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.piaoquan.api.common.enums.ReplyStrategyServiceEnum;
 import com.tzld.piaoquan.api.dao.mapper.ReplyStaffMapper;
@@ -15,7 +14,7 @@ import com.tzld.piaoquan.api.model.po.ReplyStaff;
 import com.tzld.piaoquan.api.model.po.ReplyStaffExample;
 import com.tzld.piaoquan.api.model.vo.WeComPushMessageParam;
 import com.tzld.piaoquan.api.model.vo.WeComPushMessageVo;
-import com.tzld.piaoquan.api.service.WeComService;
+import com.tzld.piaoquan.api.service.wecom.WeComService;
 import com.tzld.piaoquan.api.service.strategy.ReplyStrategyService;
 import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import com.tzld.piaoquan.growth.common.common.enums.ExceptionCodeEnum;

api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/WeComThirdPartyCallBackService.java

@@ -0,0 +1,13 @@
+package com.tzld.piaoquan.api.service.wecom.thirdparty;
+
+import com.alibaba.fastjson.JSONObject;
+
+public interface WeComThirdPartyCallBackService {
+
+    /**
+     * 处理回调
+     *
+     * @param param
+     */
+    void handleCallback(JSONObject param);
+}

api-module/src/main/java/com/tzld/piaoquan/api/service/WeComThirdPartyService.java → api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/WeComThirdPartyService.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.api.service;
+package com.tzld.piaoquan.api.service.wecom.thirdparty;
 
 import com.tzld.piaoquan.api.model.param.wecom.thirdpart.*;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComRoom;

api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/impl/WeComThirdPartyCallBackServiceImpl.java

@@ -0,0 +1,34 @@
+package com.tzld.piaoquan.api.service.wecom.thirdparty.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.tzld.piaoquan.api.component.WeComThirdPartyApiClient;
+import com.tzld.piaoquan.api.dao.mapper.wecom.thirdpart.ThirdPartWeComCorpMapper;
+import com.tzld.piaoquan.api.dao.mapper.wecom.thirdpart.ThirdPartWeComRoomMapper;
+import com.tzld.piaoquan.api.dao.mapper.wecom.thirdpart.ThirdPartWeComStaffMapper;
+import com.tzld.piaoquan.api.service.wecom.thirdparty.WeComThirdPartyCallBackService;
+import com.tzld.piaoquan.growth.common.utils.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class WeComThirdPartyCallBackServiceImpl implements WeComThirdPartyCallBackService {
+
+    @Autowired
+    private WeComThirdPartyApiClient apiClient;
+    @Autowired
+    private ThirdPartWeComStaffMapper thirdPartWeComStaffMapper;
+    @Autowired
+    private ThirdPartWeComRoomMapper thirdPartWeComRoomMapper;
+    @Autowired
+    private ThirdPartWeComCorpMapper thirdPartWeComCorpMapper;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Override
+    public void handleCallback(JSONObject param) {
+        log.info("handleCallback param: {}", param);
+    }
+}

api-module/src/main/java/com/tzld/piaoquan/api/service/impl/WeComThirdPartyServiceImpl.java → api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/impl/WeComThirdPartyServiceImpl.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.api.service.impl;
+package com.tzld.piaoquan.api.service.wecom.thirdparty.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -10,7 +10,7 @@ import com.tzld.piaoquan.api.dao.mapper.wecom.thirdpart.ThirdPartWeComRoomMapper
 import com.tzld.piaoquan.api.dao.mapper.wecom.thirdpart.ThirdPartWeComStaffMapper;
 import com.tzld.piaoquan.api.model.param.wecom.thirdpart.*;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.*;
-import com.tzld.piaoquan.api.service.WeComThirdPartyService;
+import com.tzld.piaoquan.api.service.wecom.thirdparty.WeComThirdPartyService;
 import com.tzld.piaoquan.growth.common.dao.mapper.CorpMapper;
 import com.tzld.piaoquan.growth.common.model.po.Corp;
 import com.tzld.piaoquan.growth.common.model.po.CorpExample;

api-module/src/test/java/com/tzld/piaoquan/api/WeComThirdPartTest.java

@@ -9,7 +9,7 @@ import com.tzld.piaoquan.api.job.wecom.thirdpart.WeComUserDetailJob;
 import com.tzld.piaoquan.api.model.param.wecom.thirdpart.UpdateRoomNameRequest;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComRoom;
 import com.tzld.piaoquan.api.model.po.wecom.thirdpart.ThirdPartWeComStaff;
-import com.tzld.piaoquan.api.service.WeComThirdPartyService;
+import com.tzld.piaoquan.api.service.wecom.thirdparty.WeComThirdPartyService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;