自建

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/NoticeMessageApiServiceImpl.java

@@ -39,6 +39,7 @@ import com.gic.haoban.manage.service.service.StaffService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.notify.NoticeMessageService;
 import com.gic.haoban.manage.service.service.notify.NoticeMessageTemplateService;
+import com.gic.haoban.manage.service.util.QwUtils;
 import com.gic.wechat.api.dto.qywx.ItemDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
@@ -269,6 +270,6 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
         messageDTO.setPage(appUrl);
         messageDTO.setTitle(messageTypeEnum.getName());
         messageDTO.setItems(items);
-        qywxSuiteApiService.sendMessage(corpid, config.getWxSuiteid(), messageDTO);
+        qywxSuiteApiService.sendMessage(corpid, QwUtils.getSecret(qwDTO, config.getWxSuiteid()), messageDTO,qwDTO.isSelf(),qwDTO.getUrlHost());
     }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -63,6 +63,7 @@ import com.gic.haoban.manage.service.service.WxApplicationService;
 import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
+import com.gic.haoban.manage.service.util.QwUtils;
 import com.gic.member.api.dto.es.MemberDataDTO;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
@@ -604,7 +605,7 @@ public class MessageApiServiceImpl implements MessageApiService {
         map.put("事件", message);
         List<ItemDTO> items = getItemsList(map);
         messageDTO.setItems(items);
-        qywxSuiteApiService.sendMessage(qwDTO.getThirdCorpid(), config.getWxSuiteid(), messageDTO);
+        qywxSuiteApiService.sendMessage(qwDTO.getThirdCorpid(), QwUtils.getSecret(qwDTO, config.getWxSuiteid()), messageDTO,qwDTO.isSelf(),qwDTO.getUrlHost());
         return com.gic.api.base.commons.ServiceResponse.success();
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java

@@ -34,8 +34,10 @@ import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.haoban.manage.service.util.QwUtils;
 import com.gic.wechat.api.dto.qywx.ItemDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
@@ -255,8 +257,9 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         messageDTO.setItems(items);
 
         logger.info("发送参数为corpId============:{},suitId============:{},messageDTO============:{},", corpId, config.getWxSuiteid(), JSONObject.toJSONString(messageDTO));
-
-        boolean b = qywxSuiteApiService.sendMessage(corpId, config.getWxSuiteid(), messageDTO);
+        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
+        WxEnterpriseQwDTO qwDTO =this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId()) ;
+        boolean b = qywxSuiteApiService.sendMessage(corpId, QwUtils.getSecret(qwDTO, config.getWxSuiteid()), messageDTO,qwDTO.isSelf(),qwDTO.getUrlHost());
         logger.info("发送===============》{}", b);
         return b;
     }
@@ -309,7 +312,9 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         messageDTO.setItems(contentList);
         messageDTO.setPage(pageUrl);
         logger.info("消息发送, corpId : {}, suitId : {}, messageDTO : {}", corpId, config.getWxSuiteid(), JSONObject.toJSONString(messageDTO));
-        boolean sendResult = qywxSuiteApiService.sendMessage(corpId, config.getWxSuiteid(), messageDTO);
+        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
+        WxEnterpriseQwDTO qwDTO =this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId()) ;
+        boolean sendResult = qywxSuiteApiService.sendMessage(corpId, QwUtils.getSecret(qwDTO, config.getWxSuiteid()), messageDTO,qwDTO.isSelf(),qwDTO.getUrlHost());
         logger.info("消息发送结果, sendResult : {}", sendResult);
         return sendResult;
     }
@@ -361,7 +366,9 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         messageDTO.setItems(items);
 
         logger.info("发送消息参数为corpId={},messageDTO={},", corpId, JSONObject.toJSONString(messageDTO));
-        boolean b = qywxSuiteApiService.sendMessage(corpId, config.getWxSuiteid(), messageDTO);
+        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
+        WxEnterpriseQwDTO qwDTO =this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId()) ;
+        boolean b = qywxSuiteApiService.sendMessage(corpId, QwUtils.getSecret(qwDTO, config.getWxSuiteid()), messageDTO,qwDTO.isSelf(),qwDTO.getUrlHost());
         logger.info("发送消息返回={}", b);
         return b;
     }