From 092b5226edd79f0570bafbdb0a047856bcc3385b Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 29 Oct 2022 10:15:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CourseServiceImpl.java | 4 +- .../java/com/xboe/stat/IEventDataSender.java | 18 ----- .../com/xboe/stat/impl/EventDataSender.java | 74 ------------------- 3 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 servers/boe-server-all/src/main/java/com/xboe/stat/IEventDataSender.java delete mode 100644 servers/boe-server-all/src/main/java/com/xboe/stat/impl/EventDataSender.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index c3612257..31192b2c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -9,7 +9,6 @@ import java.util.Map; import javax.annotation.Resource; -import com.xboe.common.utils.StringUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,6 +19,8 @@ import com.xboe.account.service.IAccountService; import com.xboe.common.OrderCondition; import com.xboe.common.PageList; import com.xboe.common.utils.IDGenerator; +import com.xboe.common.utils.StringUtil; +import com.xboe.core.event.IEventDataSender; import com.xboe.core.orm.FieldFilters; import com.xboe.core.orm.IFieldFilter; import com.xboe.core.orm.LikeMatchMode; @@ -48,7 +49,6 @@ import com.xboe.module.course.service.CourseToCourseFullText; import com.xboe.module.course.service.ICourseFullTextSearch; import com.xboe.module.course.service.ICourseService; import com.xboe.module.interaction.service.ICourseGradeService; -import com.xboe.stat.IEventDataSender; import com.xboe.system.authority.service.IResDataManagerService; import com.xboe.system.logs.dao.SysLogAuditDao; diff --git a/servers/boe-server-all/src/main/java/com/xboe/stat/IEventDataSender.java b/servers/boe-server-all/src/main/java/com/xboe/stat/IEventDataSender.java deleted file mode 100644 index afc918c8..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/stat/IEventDataSender.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.xboe.stat; - -public interface IEventDataSender { - - - /** - * 发送事件消息 - * @param title 事件标题 - * @param eventKey 事件key - * @param content 事件内容 - * @param objId 关联对象id - * @param objType 关联对象类型 - * @param objInfo 关联对象信息 - * @param aid 操作人 - * @param aname 操作人姓名 - */ - void send(String title,String eventKey,String content,String objId,String objType,String objInfo,String aid,String aname,String author); -} diff --git a/servers/boe-server-all/src/main/java/com/xboe/stat/impl/EventDataSender.java b/servers/boe-server-all/src/main/java/com/xboe/stat/impl/EventDataSender.java deleted file mode 100644 index 1fbbe0fb..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/stat/impl/EventDataSender.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.xboe.stat.impl; - -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xboe.core.SysConstant; -import com.xboe.core.api.TokenProxy; -import com.xboe.core.utils.OkHttpUtil; -import com.xboe.standard.BaseConstant; -import com.xboe.stat.IEventDataSender; - -import lombok.extern.slf4j.Slf4j; - -/** - * 事件数据发送者 - * @author seastar - * - */ -@Slf4j -@Component -public class EventDataSender implements IEventDataSender{ - - @Autowired - private OkHttpUtil okHttpUtil; - - @Autowired - private HttpServletRequest request; - - @Override - public void send(String title, String eventKey, String content, String objId, String objType, String objInfo, - String aid, String aname,String author) { - - String url = SysConstant.getConfigValue("xboe.stat.base.url") + "/xboe/m/stat/event/send"; - Map params = new HashMap<>(); - params.put("title", title); - params.put("source", "all"); - params.put("content", content); - params.put("objId", objId); - params.put("key", eventKey); - params.put("objType", objType); - params.put("objInfo", objInfo); - params.put("aid", aid); - params.put("aname", aname); - params.put("parameters",""); - String token = TokenProxy.getToken(request); - //最后采用异常发送，不影响当前进程 - - new Thread(()->{ - try { - ObjectMapper mapper=new ObjectMapper(); - String json =mapper.writeValueAsString(params); - //String[] headers=new String[] {"token",token}; - String[] headers=new String[] {BaseConstant.HTTP_ACCESS_TOKEN,token}; - - String responseStr = okHttpUtil.doPostJson(url, json,headers); - if(responseStr.indexOf("\"status\":200")==-1) { - log.error("发送事件失败:"+responseStr); - log.info("【发送的token】"+headers[0]+"： "+headers[1]); - } - }catch(Exception e) { - log.error("发送事件错误",e); - } - }).start(); - - } - - -}