diff --git a/.idea/compiler.xml b/.idea/compiler.xml index ea08156b..75ce7554 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -11,9 +11,9 @@ - - - + + + diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml deleted file mode 100644 index c27223f1..00000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_1.xml deleted file mode 100644 index bd733beb..00000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/xm-server.iml b/.idea/xm-server.iml index b43de8c6..a8647537 100644 --- a/.idea/xm-server.iml +++ b/.idea/xm-server.iml @@ -9,6 +9,8 @@ + + @@ -65,8 +67,6 @@ - - diff --git a/pom.xml b/pom.xml index 164a1b85..f7dc9816 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,14 @@ com.qingqinkj.mdp mdp-utils + + com.qingqinkj.mdp + mdp-micro-client + + + com.qingqinkj.mdp + mdp-msg-client + com.qingqinkj.mdp mdp-core diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java b/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java index daf26ad0..63eab9a4 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.qqkj.mdp.msg.client.PushMsgService; import org.springframework.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; @@ -11,7 +12,6 @@ import org.springframework.stereotype.Service; import com.qqkj.xm.core.service.XmMenuExchangeService; import com.qqkj.xm.core.service.XmMenuService; -import com.qqkj.xm.push.service.PushMsgService; @Service public class XmMenuPushMsgService extends PushMsgService { diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java b/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java index 21f8a1dc..4fe443fe 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java +++ b/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java @@ -5,10 +5,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.qqkj.mdp.msg.client.PushMsgService; import org.springframework.util.StringUtils; import org.springframework.stereotype.Service; -import com.qqkj.xm.push.service.PushMsgService; @Service public class XmPushMsgService extends PushMsgService { @@ -19,7 +19,6 @@ public class XmPushMsgService extends PushMsgService { * 添加候选人时-发送消息给候选人，发消息给任务负责人，发消息给故事负责人 * 候选人变成执行人-发送消息给候选人，发消息给任务负责人，发消息给故事负责人 * 执行人提交测试，提交验收时发给 故事负责人，任务负责人，小组组长 - * @param toUserid * @param msg */ public void pushCssMsg(String branchId,String sendUserid,String sendUsername,String msg){ diff --git a/xm-core/src/main/java/com/qqkj/xm/push/service/CallBizService.java b/xm-core/src/main/java/com/qqkj/xm/push/service/CallBizService.java deleted file mode 100644 index 57fb8e0d..00000000 --- a/xm-core/src/main/java/com/qqkj/xm/push/service/CallBizService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.qqkj.xm.push.service; - -import java.util.Map; - -import javax.annotation.PostConstruct; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.utils.BaseUtils; -import com.qqkj.mdp.safe.common.rest.MdpRestTemplate; - -@Service -public class CallBizService { - - @Value("${spring.profiles.active:dev}") - String profiles="dev"; - - @Autowired - MdpRestTemplate restTemplate; - - Log logger=LogFactory.getLog(CallBizService.class); - - @Value("${mdp.api-gate:http://gate}")//云环境下 - //@Value("${mdp.api-gate:https://www.qingqinkj.com/api/m1}") //本地调试 - String apiGate=""; - - - public Tips callApi(String restUrl,Map params){ - - Tips tips=new Tips("远程调用成功"); - if(!StringUtils.isEmpty(restUrl)) { - if(restUrl.indexOf("http")<0 && restUrl.indexOf("www")<0) { - restUrl=apiGate+restUrl; - } - } - ResponseEntity forEntity = restTemplate.postForEntity(restUrl, params,Map.class); - Map m = (Map)forEntity.getBody(); - tips= BaseUtils.mapToTips(m); - if(tips!=null) { - if(!tips.isOk()){ - logger.error(tips.toString()); - return tips; - }else { - //成功调用 - logger.info(tips.toString()); - } - }else { - tips=new Tips("后台未返回任何数据"); - } - return tips; - } - - @PostConstruct - void initApiGate(){ - if("dev".equals(this.profiles)) { - //this.apiGate="http://127.0.0.1:7080/workflow"; - this.apiGate="https://www.qingqinkj.com/api/m1"; - } - } - -} diff --git a/xm-core/src/main/java/com/qqkj/xm/push/service/PushMsgService.java b/xm-core/src/main/java/com/qqkj/xm/push/service/PushMsgService.java deleted file mode 100644 index 76e02cac..00000000 --- a/xm-core/src/main/java/com/qqkj/xm/push/service/PushMsgService.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.qqkj.xm.push.service; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -import javax.annotation.PostConstruct; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.qqkj.mdp.core.entity.Tips; - -@Service -public class PushMsgService { - - @Autowired - CallBizService callBizServie; - - private static ExecutorService pool; - - @PostConstruct - public void initPool(){ - //maximumPoolSize设置为2 ，拒绝策略为AbortPolic策略，直接抛出异常 - pool = new ThreadPoolExecutor(10, 20, 1000, TimeUnit.MILLISECONDS, new SynchronousQueue(),Executors.defaultThreadFactory(),new ThreadPoolExecutor.AbortPolicy() ); - - } - - - public void pushPrichatMsgToIm(String branchId,String sendUserid,String sendUsername,String toUserid,String toUsername,String msg) { - Map map=new HashMap<>(); - map.put("toUserid", toUserid); - map.put("toUsername", toUsername); - map.put("sendUserid", sendUserid); - map.put("sendUsername", sendUsername); - - map.put("sendContent", msg); - map.put("store", "1"); - pool.execute(new Runnable() { - - @Override - public void run() { - try { - Tips tips=callBizServie.callApi("/im/im/push/publishPrichatMessage", map); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - }); - - } - - public void pushMsgToIm(Map message) { - - message.put("store", "1"); - //Tips tips=callBizServie.callApi("/im/im/push/publishMessage", message); - - pool.execute(new Runnable() { - - @Override - public void run() { - try { - Tips tips=callBizServie.callApi("/im/im/push/publishMessage", message); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - }); - - } - - public void pushGroupMsg(String branchId,String groupId,String sendUserid,String sendUsername,String msg) { - Map message=new HashMap<>(); - message.put("groupId", groupId); - message.put("action", "newMessage"); - message.put("msgType", "group"); - message.put("branchId", branchId); - message.put("sendUserid", sendUserid); - message.put("sendUsername", sendUsername); - message.put("sendContent", msg); - message.put("store", "1"); - this.pushMsgToIm(message); - } - public void pushLeaveChannelGroupMsg(String branchId,String groupId,List> users) { - Map map=new HashMap<>(); - map.put("groupId", groupId); - map.put("action", "leaveChannelGroup"); - map.put("msgType", "group"); - map.put("users",users); - map.put("branchId", branchId); - map.put("store", "1"); - this.pushMsgToIm(map); - } - public void pushJoinChannelGroupMsg(String branchId,String groupId,List> users) { - Map map=new HashMap<>(); - map.put("groupId", groupId); - map.put("action", "joinChannelGroup"); - map.put("msgType", "group"); - map.put("users",users); - map.put("store", "1"); - map.put("branchId", branchId); - this.pushMsgToIm(map); - } - public void pushChannelGroupRemoveMsg(String branchId,String groupId) { - Map map=new HashMap<>(); - map.put("groupId", groupId); - map.put("action", "channelGroupRemove"); - map.put("msgType", "group"); - map.put("branchId", branchId); - map.put("store", "1"); - this.pushMsgToIm(map); - } - public void pushChannelGroupCreateMsg(String branchId,String bizPid,String bizId,String groupId,String groupName,String cuserid,String cusername,List> users,String msg) { - Map map=new HashMap<>(); - map.put("groupId", groupId); - map.put("groupName", groupName); - map.put("categoryId", "common"); - map.put("users", users); - map.put("cuserid", cuserid); - map.put("cusername", cusername); - map.put("branchId", branchId); - map.put("bizPid", bizPid); - map.put("bizId", bizId); - map.put("action", "channelGroupCreate"); - map.put("sendContent", msg); - map.put("msgType", "group"); - map.put("store", "1"); - this.pushMsgToIm(map); - } - public void pushChannelGroupCreateMsg(String branchId,String categoryId,String bizPid,String bizId,String groupId,String groupName,String cuserid,String cusername,List> users,String msg) { - Map map=new HashMap<>(); - map.put("groupId", groupId); - map.put("groupName", groupName); - map.put("categoryId", categoryId); - - map.put("users", users); - map.put("cuserid", cuserid); - map.put("cusername", cusername); - map.put("branchId", branchId); - map.put("bizPid", bizPid); - map.put("bizId", bizId); - - map.put("sendContent", msg); - map.put("action", "channelGroupCreate"); - map.put("msgType", "group"); - map.put("store", "1"); - this.pushMsgToIm(map); - } - - -} diff --git a/xm-core/xm-core.iml b/xm-core/xm-core.iml index ef9a7616..cf88a592 100644 --- a/xm-core/xm-core.iml +++ b/xm-core/xm-core.iml @@ -26,6 +26,8 @@ + + @@ -68,8 +70,6 @@ - - diff --git a/xm-starter/xm-starter.iml b/xm-starter/xm-starter.iml index 06a4f062..53fc310c 100644 --- a/xm-starter/xm-starter.iml +++ b/xm-starter/xm-starter.iml @@ -137,6 +137,8 @@ + + @@ -180,8 +182,6 @@ - -