自建

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatHmServiceImpl.java

@@ -143,7 +143,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
             if (null != secretSetting) {
                 WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
                 ServiceResponse<Void> resp = this.qywxChatApiService.delJoinWay(qwDTO.getDkCorpid(),
-                        secretSetting.getSecretVal(), hm.getWxConfigId());
+                        secretSetting.getSecretVal(), hm.getWxConfigId(),qwDTO.getUrlHost());
                 logger.info("删除群活码={}", JSON.toJSON(resp));
             }
         }
@@ -190,7 +190,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         String configId = hm.getWxConfigId();
         ServiceResponse<AddJoinWayDTO> joinResp = this.qywxChatApiService.getJoinWay(qwDTO.getDkCorpid(), secret,
-                configId);
+                configId,qwDTO.getUrlHost());
         logger.info("查询群活码={}", JSON.toJSON(joinResp));
         if (joinResp.isSuccess()) {
             AddJoinWayDTO join = joinResp.getResult();
@@ -303,7 +303,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
         if (updateFlag) {
             joinDTO.setConfig_id(hm.getWxConfigId());
             ServiceResponse<Void> updateResp = this.qywxChatApiService.updateJoinWay(qwDTO.getDkCorpid(),
-                    secretSetting.getSecretVal(), joinDTO);
+                    secretSetting.getSecretVal(), joinDTO,qwDTO.getUrlHost());
             if (!updateResp.isSuccess()) {
                 return ServiceResponse.failure("9999", updateResp.getMessage());
             }
@@ -339,14 +339,14 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
 
         } else {
             ServiceResponse<String> addResp = this.qywxChatApiService.addJoinWay(qwDTO.getDkCorpid(),
-                    secretSetting.getSecretVal(), joinDTO);
+                    secretSetting.getSecretVal(), joinDTO,qwDTO.getUrlHost());
             logger.info("addResp={}", JSON.toJSONString(addResp));
             if (!addResp.isSuccess()) {
                 return ServiceResponse.failure("9999", addResp.getMessage());
             }
             String configId = addResp.getResult();
             ServiceResponse<AddJoinWayDTO> getResp = this.qywxChatApiService.getJoinWay(qwDTO.getDkCorpid(),
-                    secretSetting.getSecretVal(), configId);
+                    secretSetting.getSecretVal(), configId,qwDTO.getUrlHost());
             logger.info("getResp={}", JSON.toJSONString(getResp));
             if (!getResp.isSuccess()) {
                 return ServiceResponse.failure("9999", getResp.getMessage());

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -68,6 +68,7 @@ import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.chat.GroupChatHmService;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
+import com.gic.haoban.manage.service.util.QwUtils;
 import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.service.MemberService;
 import com.gic.mq.sdk.GicMQClient;
@@ -530,14 +531,8 @@ public class GroupChatServiceImpl implements GroupChatService {
     private void syncGroupChatList(WxEnterpriseQwDTO qwDTO, List<String> userIdList, String cursor,
             boolean syncDetailFlag) {
         logger.info("同步群列表={},idlist={},cursor={}", JSON.toJSONString(qwDTO), JSON.toJSONString(userIdList), cursor);
-        ServiceResponse<GroupChatListDTO> resp = null ;
-        if(qwDTO.isSelf()) {
-            resp = this.qywxChatApiService.groupchatList(qwDTO.getThirdCorpid(),
-                    qwDTO.getSelfSecret() , userIdList, limit, cursor);
-        }else {
-            resp = this.qywxChatApiService.groupchatList3th(qwDTO.getThirdCorpid(),
-                    config.getWxSuiteid(), userIdList, limit, cursor);
-        }
+        ServiceResponse<GroupChatListDTO> resp = this.qywxChatApiService.groupchatList(qwDTO.getThirdCorpid(),
+                    QwUtils.getSecret(qwDTO, config.getWxSuiteid()) , userIdList, limit, cursor , qwDTO.isSelf(), qwDTO.getUrlHost());
         if (!resp.isSuccess()) {
             logger.info("拉取群列表异常={}", JSON.toJSON(resp));
             return;
@@ -620,14 +615,9 @@ public class GroupChatServiceImpl implements GroupChatService {
         Long groupChatId = chat.getGroupChatId();
         String wxEnterpriseId = chat.getWxEnterpriseId();
         String enterpriseId = chat.getEnterpriseId();
-        ServiceResponse<GroupChatDetailDTO> detailResp = null ;
-        if(qwDTO.isSelf()) {
-            detailResp = this.qywxChatApiService
-                    .groupchatDetail(qwDTO.getThirdCorpid(), qwDTO.getSelfSecret(), chat.getWxChatId(), 1);
-        }else {
-            detailResp = this.qywxChatApiService
-                    .groupchatDetail3th(qwDTO.getThirdCorpid(), config.getWxSuiteid(), chat.getWxChatId(), 1);
-        }
+        ServiceResponse<GroupChatDetailDTO> detailResp = this.qywxChatApiService
+                    .groupchatDetail(qwDTO.getThirdCorpid(), QwUtils.getSecret(qwDTO, config.getWxSuiteid()), chat.getWxChatId(), 1 , qwDTO.isSelf() , qwDTO.getUrlHost());
+     
         logger.info("从企微获取群详情{}={}", chat.getWxChatId(), JSON.toJSON(detailResp));
         if (!detailResp.isSuccess()) {
             logger.info("从企微获取群详情失败");
@@ -995,7 +985,7 @@ public class GroupChatServiceImpl implements GroupChatService {
     private void updateWxChatIdDk(WxEnterpriseQwDTO qwDTO, List<String> userIdList, String cursor, String staffId,
             String secret) {
         ServiceResponse<GroupChatListDTO> resp = this.qywxChatApiService.groupchatList(qwDTO.getDkCorpid(), secret,
-                userIdList, limit, cursor);
+                userIdList, limit, cursor ,true , qwDTO.getUrlHost());
         if (!resp.isSuccess()) {
             logger.info("拉取群异常={}", JSON.toJSON(resp));
             return;
@@ -1006,7 +996,7 @@ public class GroupChatServiceImpl implements GroupChatService {
         for (GroupChatListItemDTO item : list) {
             String wxChatIdDk = item.getChat_id();
             ServiceResponse<GroupChatDetailDTO> detailResp = this.qywxChatApiService
-                    .groupchatDetail(qwDTO.getDkCorpid(), secret, wxChatIdDk, 1);
+                    .groupchatDetail(qwDTO.getDkCorpid(), secret, wxChatIdDk, 1 , true , qwDTO.getUrlHost());
             if (detailResp.isSuccess()) {
                 GroupChatDetailDTO detail = detailResp.getResult();
                 Long createTimeLong = detail.getCreate_time() * 1000;
@@ -1104,14 +1094,8 @@ public class GroupChatServiceImpl implements GroupChatService {
         }
         List<TabGroupChat> list = this.groupChatMapper.listByIdSet(new HashSet<>(groupChatIdList));
         List<String> wxChatIdList = list.stream().map(dto -> dto.getWxChatId()).collect(Collectors.toList());
-        ServiceResponse<List<FailChatListDTO>> resp = null ;
-        if(qwDTO.isSelf()) {
-            resp = this.qywxChatApiService.transferSelf(qwDTO.getThirdCorpid(),
-                    qwDTO.getSelfSecret(), wxChatIdList, userid);
-        }else {
-            resp = this.qywxChatApiService.transfer(qwDTO.getThirdCorpid(),
-                    config.getWxSuiteid(), wxChatIdList, userid);
-        }
+        ServiceResponse<List<FailChatListDTO>> resp =  this.qywxChatApiService.transfer(qwDTO.getThirdCorpid(),
+                QwUtils.getSecret(qwDTO, config.getWxSuiteid()), wxChatIdList, userid,qwDTO.isSelf(),qwDTO.getUrlHost());
         logger.info("群继承,继承人={}", JSON.toJSONString(resp), userid);
         if (!resp.isSuccess()) {
             return ServiceResponse.failure("9999", resp.getMessage());