diff --git a/WEB-INF/prop/PORTAL_INFO.properties b/WEB-INF/prop/PORTAL_INFO.properties new file mode 100644 index 00000000..d1f9d11e --- /dev/null +++ b/WEB-INF/prop/PORTAL_INFO.properties @@ -0,0 +1,23 @@ +##门户地址 +portal_host = http://172.16.25.133 + +##门户人员认证接口 +portal_user_auth = http://172.16.25.133/portal-web/user/current + +##门户首页 +portal_homepage = http://172.16.25.133/portal-web/# + +##RocketMq的consumerGroup +consumerGroup = cbec-consumer-group_nj_133 + +##RocketMq的namesrvAddr +namesrvAddr = 172.16.84.183:9001;172.16.84.187:9001 + +##RocketMq的instanceName +instanceName = dataSync_topic_nj + +##RocketMq的topic +topic = dataSync_topic_nj + +##RocketMq的subExpression +subExpression = BPM diff --git a/src/com/api/bpm/todo/WorkflowTodoActionApi.java b/src/com/api/bpm/todo/WorkflowTodoActionApi.java deleted file mode 100644 index fc8571a7..00000000 --- a/src/com/api/bpm/todo/WorkflowTodoActionApi.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.api.bpm.todo; - - - -import com.engine.bpm.todo.web.WorkflowTodoAction; - -import javax.ws.rs.Path; - -@Path("/workflow") -public class WorkflowTodoActionApi extends WorkflowTodoAction { -} diff --git a/src/com/api/mq/RocketMqActionApi.java b/src/com/api/mq/RocketMqActionApi.java deleted file mode 100644 index 1755dac2..00000000 --- a/src/com/api/mq/RocketMqActionApi.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.api.mq; - - -import com.engine.mq.RocketMqAction; - -import javax.ws.rs.Path; - -@Path("/kxn/spa") -public class RocketMqActionApi extends RocketMqAction { -} diff --git a/src/com/api/mq/init/RocketmqInit.java b/src/com/api/mq/init/RocketmqInit.java deleted file mode 100644 index 61cfa334..00000000 --- a/src/com/api/mq/init/RocketmqInit.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.api.mq.init; - - -import com.api.mq.util.RocketmqUtil; -import com.sun.jersey.api.model.AbstractResourceModelContext; -import com.sun.jersey.api.model.AbstractResourceModelListener; -import com.sun.jersey.core.util.Priority; -//import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; -//import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; -//import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; -//import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; -//import org.apache.rocketmq.client.exception.MQClientException; -//import org.apache.rocketmq.common.message.MessageExt; -import weaver.general.BaseBean; - -import javax.ws.rs.ext.Provider; -import java.io.*; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -@Provider -@Priority(100) -public class RocketmqInit implements AbstractResourceModelListener{ - @Override - public void onLoaded(AbstractResourceModelContext abstractResourceModelContext) { - - BaseBean bb = new BaseBean(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); - - bb.writeLog("initiated---进入时间："+sdf.format(new Date())); - bb.writeLog("##### resource model initiated"); - bb.writeLog("##### resource model initiated"); - bb.writeLog("##### resource model initiated"); - RocketmqUtil rocketmqUtil = new RocketmqUtil(); - -// try{ -// -// DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("portal-producer-group_nj"); -// consumer.setNamesrvAddr("172.16.84.183:9001;172.16.84.187:9001"); -// consumer.setInstanceName("dataSync_topic_nj"); -//// consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET); -// consumer.subscribe("dataSync_topic_nj", "*"); -// consumer.registerMessageListener(new MessageListenerConcurrently() { -// @Override -// public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { -// MessageExt msg = msgs.get(0); -// try { -// bb.writeLog("3----"+new String(msg.getBody())); -// String msgdata = new String(msg.getBody(),"UTF-8"); -// if(!"".equals(msgdata)) -// { -// String data = msgdata.substring(msgdata.indexOf("{")); -// int errcount = rocketmqUtil.updateOrgData(data); -// if(errcount >0){ -// return ConsumeConcurrentlyStatus.RECONSUME_LATER; -// } -// } -// } catch (UnsupportedEncodingException e) { -// e.printStackTrace(); -// bb.writeLog("UnsupportedEncodingException---e:"+e); -// return ConsumeConcurrentlyStatus.RECONSUME_LATER; -// } -// return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; -// } -// }); -// -// /** -// * Consumer对象在使用之前必须要调用start初始化，初始化一次即可
-// */ -// consumer.start(); -// bb.writeLog("Consumer Started."); -// -// }catch (MQClientException e){ -// bb.writeLog("##### resource model initiated--MQClientException:"+e); -// } - - bb.writeLog("##### resource model initiated"); - bb.writeLog("##### resource model initiated"); - bb.writeLog("##### resource model initiated"); - } -} diff --git a/src/com/api/mq/util/RocketmqUtil.java b/src/com/api/mq/util/RocketmqUtil.java deleted file mode 100644 index b591fbb5..00000000 --- a/src/com/api/mq/util/RocketmqUtil.java +++ /dev/null @@ -1,494 +0,0 @@ -package com.api.mq.util; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.apache.commons.codec.digest.DigestUtils; -import weaver.conn.RecordSet; -import weaver.general.BaseBean; -import weaver.general.TimeUtil; -import weaver.general.Util; -import weaver.hrm.company.DepartmentComInfo; -import weaver.hrm.resource.ResourceComInfo; - -public class RocketmqUtil { - - public int updateOrgData(String data) - { - - BaseBean bb = new BaseBean(); - int errcount = 0; - JSONObject jsonObject = JSONObject.parseObject(data); - if(jsonObject.containsKey("requestObject")) - { - JSONArray requestArray = jsonObject.getJSONArray("requestObject"); - - for(int i=0;i> { - @Override - public BizLogContext getLogContext() { - return null; - } - - public WorkflowTodoListCmd(Map params) { - this.params = params; - } - @Override - public Map execute(CommandContext commandContext) { - - List> list = new ArrayList>(); - Map apidatas = new HashMap(); - RecordSet rs = new RecordSet(); - BaseBean bb = new BaseBean(); - String uid = Util.null2String(params.get("uid")); - String userCode = Util.null2String(params.get("userCode")); - String zsmartLocale = Util.null2String(params.get("zsmartLocale")); - String sql = "" ; - rs.executeQuery(sql); - - Map map = null; - - while (rs.next()){ - String requestname = Util.null2String(rs.getString("requestname")); - String requestid = Util.null2String(rs.getString("requestid")); - String createdate = Util.null2String(rs.getString("createdate")); - String createdtime = Util.null2String(rs.getString("createdtime")); - String creator = Util.null2String(rs.getString("creator")); - String type = Util.null2String(rs.getString("type")); - - map = new HashMap(); - - map.put("title", requestname); //标题 - map.put("url", "bpm/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid); //待办信息的全量路径，如果有待办id的话也需要携带在url中方便业务采集到是哪个待办信息 - map.put("date", createdate+" "+createdtime); //创建时间 - map.put("creator", creator); //发起人 - map.put("type",type); //待办类型 - list.add(map); - } - - apidatas.put("list",list); - return apidatas; - } - -} diff --git a/src/com/engine/bpm/todo/service/WorkflowTodoService.java b/src/com/engine/bpm/todo/service/WorkflowTodoService.java deleted file mode 100644 index 8f4fa83f..00000000 --- a/src/com/engine/bpm/todo/service/WorkflowTodoService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.engine.bpm.todo.service; - -import java.util.Map; - -public interface WorkflowTodoService { - - Map doGetTodoList(Map apidatas); -} diff --git a/src/com/engine/bpm/todo/service/impl/WorkflowTodoServiceImpl.java b/src/com/engine/bpm/todo/service/impl/WorkflowTodoServiceImpl.java deleted file mode 100644 index 8a4708ec..00000000 --- a/src/com/engine/bpm/todo/service/impl/WorkflowTodoServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.engine.bpm.todo.service.impl; - -import com.engine.bpm.todo.cmd.WorkflowTodoListCmd; -import com.engine.bpm.todo.service.WorkflowTodoService; -import com.engine.core.impl.Service; - -import java.util.Map; - -public class WorkflowTodoServiceImpl extends Service implements WorkflowTodoService { - @Override - public Map doGetTodoList(Map apidatas) { - return commandExecutor.execute(new WorkflowTodoListCmd(apidatas)); - } - -} diff --git a/src/com/engine/bpm/todo/web/WorkflowTodoAction.java b/src/com/engine/bpm/todo/web/WorkflowTodoAction.java deleted file mode 100644 index 0e1a0fd8..00000000 --- a/src/com/engine/bpm/todo/web/WorkflowTodoAction.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.engine.bpm.todo.web; - - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.engine.bpm.todo.service.WorkflowTodoService; -import com.engine.bpm.todo.service.impl.WorkflowTodoServiceImpl; -import com.engine.common.util.ServiceUtil; -import weaver.general.BaseBean; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class WorkflowTodoAction { - - /*** - * - * @return - */ - public WorkflowTodoService getService(){ - return (WorkflowTodoService) ServiceUtil.getService(WorkflowTodoServiceImpl.class); - } - - - - @GET - @Path("/todolist") - @Produces(MediaType.TEXT_PLAIN) - public String doGetTodoList(@Context HttpServletRequest request, @Context HttpServletResponse response){ - - BaseBean bb = new BaseBean(); - - JSONArray jsonArray = new JSONArray(); - List> list = new ArrayList>(); - try{ - String type = request.getParameter("type"); - String uid = "" ; - String userCode = "" ; - String zsmartLocale = ""; - String cookies = request.getHeader("cookie"); - bb.writeLog("cookies:"+cookies); - if(!"".equals(cookies)) - { - String[] cookievals = cookies.split(";"); - for(int i=0;i dataMap = new HashMap(); - dataMap.put("uid",uid); - dataMap.put("userCode",userCode); - dataMap.put("zsmartLocale",zsmartLocale); - - Map map = getService().doGetTodoList(dataMap); - if(map !=null && map.containsKey("list")){ - list = (List>)map.get("list"); - } - jsonArray.addAll(list); - }catch (Exception e){ - } - return jsonArray.toJSONString(); - } - - - @POST - @Path("/posttodolist") - @Produces(MediaType.TEXT_PLAIN) - public String doPostTodoList(@Context HttpServletRequest request, @Context HttpServletResponse response){ - - BaseBean bb = new BaseBean(); - JSONObject jsonObject = new JSONObject(); - try{ - - - }catch (Exception e){ - } - return jsonObject.toJSONString(); - } -} diff --git a/src/com/engine/mq/RocketMqAction.java b/src/com/engine/mq/RocketMqAction.java deleted file mode 100644 index 50f28086..00000000 --- a/src/com/engine/mq/RocketMqAction.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.engine.mq; - - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.rocketmq.client.consumer.DefaultMQPushConsumer; -import com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; -import com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; -import com.alibaba.rocketmq.client.consumer.listener.MessageListenerConcurrently; -import com.alibaba.rocketmq.client.exception.MQClientException; -import com.alibaba.rocketmq.common.message.MessageExt; -import com.alibaba.rocketmq.common.protocol.heartbeat.MessageModel; -import weaver.general.BaseBean; -import weaver.interfaces.qt.RocketmqUtil2; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import java.io.UnsupportedEncodingException; -import java.util.List; - -public class RocketMqAction { - - @GET - @Path("/getpurchasereq1") - @Produces(MediaType.TEXT_PLAIN) - public String doGetPurchaseReq1(@Context HttpServletRequest request, @Context HttpServletResponse response){ - - BaseBean bb = new BaseBean(); - JSONObject jsonObject = new JSONObject(); - try{ - - DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("portal-producer-group_nj"); - consumer.setNamesrvAddr("172.16.84.183:9001;172.16.84.187:9001"); - consumer.setInstanceName("dataSync_topic_nj"); -// consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET); - consumer.subscribe("dataSync_topic_nj", "*"); - - - consumer.setConsumeThreadMin(20); - consumer.setConsumeThreadMax(60); - consumer.setConsumeMessageBatchMaxSize(1); - consumer.setMessageModel(MessageModel.BROADCASTING); - - RocketmqUtil2 rocketmqUtil = new RocketmqUtil2(); - bb.writeLog("Consumer begin."); - - - consumer.registerMessageListener(new MessageListenerConcurrently() { - @Override - public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { - MessageExt msg = msgs.get(0); - try { - bb.writeLog("Consumer---3----"+new String(msg.getBody())); - String msgdata = new String(msg.getBody(),"UTF-8"); - if(!"".equals(msgdata)) - { - String data = msgdata.substring(msgdata.indexOf("{")); - int errcount = rocketmqUtil.updateOrgData(data); - if(errcount >0){ - return ConsumeConcurrentlyStatus.RECONSUME_LATER; - } - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - bb.writeLog("Consumer---UnsupportedEncodingException---e:"+e); - return ConsumeConcurrentlyStatus.RECONSUME_LATER; - } - return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; - } - }); - - /** - * Consumer对象在使用之前必须要调用start初始化，初始化一次即可
- */ - consumer.start(); - bb.writeLog("Consumer Started."); - - }catch (MQClientException e){ - bb.writeLog("Consumer resource model initiated--MQClientException:"+e); - } - return jsonObject.toJSONString(); - } -} diff --git a/src/weaver/interfaces/esigns/ESiginsTest.java b/src/weaver/interfaces/esigns/ESiginsTest.java deleted file mode 100644 index a457a3c6..00000000 --- a/src/weaver/interfaces/esigns/ESiginsTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package weaver.interfaces.esigns; - -import com.alibaba.fastjson.JSONObject; -import weaver.general.BaseBean; -import weaver.general.Util; -import weaver.hrm.User; -import weaver.interfaces.filter.HttpRequestUtil; - -import java.util.HashMap; -import java.util.Map; - -public class ESiginsTest { - - public static void main(String[] args) { - - BaseBean bb = new BaseBean(); - HttpRequestUtil httpRequestUtil = new HttpRequestUtil(); - try{ - - - String uid = "" ; - String cookies = "" ;//request.getHeader("cookie"); - bb.writeLog("cookies:"+cookies); - if(!"".equals(cookies)) - { - String[] cookievals = cookies.split(";"); - for(int i=0;i headMap = new HashMap(); - - headMap.put("Cookie","SESSION="+uid); - String msg = HttpRequestUtil.httpGet2(url,headMap,"UTF-8"); - System.out.println("msg ==" + msg); - if(!"".equals(msg)) - { - JSONObject jsonObject = JSONObject.parseObject(msg); - if("1".equals(jsonObject.getString("resultCode"))) - { - - }else{ - - } - } - }catch (Exception e3){ - System.out.println("e---2:"+e3); - } - } -} diff --git a/src/weaver/interfaces/filter/HttpRequestUtil.java b/src/weaver/interfaces/filter/HttpRequestUtil.java index fecb9690..4a97ef3b 100644 --- a/src/weaver/interfaces/filter/HttpRequestUtil.java +++ b/src/weaver/interfaces/filter/HttpRequestUtil.java @@ -154,7 +154,14 @@ public class HttpRequestUtil extends BaseBean{ } - public static String httpGet1(String url, Map headers, String encode){ + /*** + * + * @param url + * @param headers + * @param encode + * @return + */ + public String httpGet1(String url, Map headers, String encode){ BaseBean bb = new BaseBean(); bb.writeLog("url",url); @@ -210,7 +217,7 @@ public class HttpRequestUtil extends BaseBean{ * @param encode * @return */ - public static String httpGet2(String url,Map headers,String encode) + public String httpGet2(String url,Map headers,String encode) { BaseBean bb = new BaseBean(); diff --git a/src/weaver/interfaces/filter/PortalLoginBeforeFilter.java b/src/weaver/interfaces/filter/PortalLoginBeforeFilter.java index 1cdbe6c6..14b23dff 100644 --- a/src/weaver/interfaces/filter/PortalLoginBeforeFilter.java +++ b/src/weaver/interfaces/filter/PortalLoginBeforeFilter.java @@ -1,8 +1,7 @@ package weaver.interfaces.filter; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.BaseBean; import weaver.general.Util; @@ -34,17 +33,16 @@ public class PortalLoginBeforeFilter implements Filter HttpServletRequest request = (HttpServletRequest)servletRequest; HttpServletResponse response = (HttpServletResponse)servletResponse; - String ipAddress = request.getRequestURL().toString(); //先从nginx自定义配置获取，，可能unknown - if(ipAddress.contains("10.10.192.187")){ - //bb.writeLog("10.10.192.187"); - }else{ +// String ipAddress = request.getRequestURL().toString(); //先从nginx自定义配置获取，，可能unknown +// if(ipAddress.contains("10.10.192.187")){ +// //bb.writeLog("10.10.192.187"); +// }else{ User loginuser = (User) request.getSession(true).getAttribute("weaver_user@bean"); if (loginuser == null) { String uid = "" ; String cookies = request.getHeader("cookie"); -// bb.writeLog("cookies:"+cookies); if(!"".equals(cookies)) { String[] cookievals = cookies.split(";"); @@ -55,7 +53,6 @@ public class PortalLoginBeforeFilter implements Filter { String key = cookval.substring(0,cookval.indexOf("=")); String value = cookval.substring(cookval.indexOf("=")+1); -// bb.writeLog("key:"+key + " value:"+value); if("SESSION".equals(key.trim()) || key.contains("SESSION")){ uid = value; } @@ -70,16 +67,16 @@ public class PortalLoginBeforeFilter implements Filter // CLOUD_APP_NAME=dbeptest7_pot-uportal-core; // CLOUD_APP_ID=44074 -// bb.writeLog("uid 777==" + (!"null".equals(uid) && uid !=null && !"".equals(uid) && uid !="")); -// bb.writeLog("uid 666 ==" + uid); - if(!"null".equals(uid) && uid !=null && !"".equals(uid) && uid !="") + if(StringUtils.isNotEmpty(uid)) { - String url = "http://172.16.25.133/portal-web/user/current" ; + String url = bb.getPropValue("PORTAL_INFO","portal_user_auth"); + //String url = "http://172.16.25.133/portal-web/user/current" ; + bb.writeLog("url:"+url); + HttpRequestUtil HttpRequestUtil = new HttpRequestUtil(); Map headMap = new HashMap(); headMap.put("Cookie","SESSION="+uid); String msg = HttpRequestUtil.httpGet1(url,headMap,"UTF-8"); - if(!"".equals(msg)) { JSONObject jsonObject = JSONObject.parseObject(msg); @@ -88,7 +85,6 @@ public class PortalLoginBeforeFilter implements Filter JSONObject resultObject = jsonObject.getJSONObject("resultObject"); String staffCode = resultObject.getString("staffCode"); if(!"".equals(staffCode)){ - User user_new = null; String sql = "" ; if("admin".equals(staffCode)){ @@ -97,7 +93,7 @@ public class PortalLoginBeforeFilter implements Filter }else{ sql = " select * from HrmResource where loginid =? "; } - //bb.writeLog("sql:"+sql); + bb.writeLog("sql:"+sql); rs.executeQuery(sql,new Object[]{staffCode}); if(rs.next()){ user_new = new User(); @@ -151,7 +147,7 @@ public class PortalLoginBeforeFilter implements Filter } } } - } +// } filterChain.doFilter(request, response); } diff --git a/src/weaver/interfaces/filter/PortalLoginFilter.java b/src/weaver/interfaces/filter/PortalLoginFilter.java index fe2d77b0..cee5680f 100644 --- a/src/weaver/interfaces/filter/PortalLoginFilter.java +++ b/src/weaver/interfaces/filter/PortalLoginFilter.java @@ -77,17 +77,14 @@ public class PortalLoginFilter implements Filter HttpServletRequest request = (HttpServletRequest)servletRequest; HttpServletResponse response = (HttpServletResponse)servletResponse; -// if(StringUtils.isNotBlank(request.getHeader("x-requested-with"))){ -// request.setCharacterEncoding("UTF-8"); -// } - String ipAddress = request.getRequestURL().toString(); //先从nginx自定义配置获取，，可能unknown //bb.writeLog("ipAddress1:"+ipAddress); - if(ipAddress.contains("10.10.192.187")){ - //bb.writeLog("10.10.192.187"); - }else{ +// if(ipAddress.contains("10.10.192.187")){ +// //bb.writeLog("10.10.192.187"); +// }else{ + String portal_homepage = bb.getPropValue("PORTAL_INFO","portal_homepage"); boolean isExcludedPage = false; String getRequestURI = request.getRequestURI(); //请求地址 @@ -97,60 +94,14 @@ public class PortalLoginFilter implements Filter isExcludedPage = true; } -// if(!isExcludedPage) -// { -// if(getRequestURI.startsWith(".js", getRequestURI.lastIndexOf(".")) && !getRequestURI.startsWith(".jsp", getRequestURI.lastIndexOf("."))){ -// isExcludedPage = true; -// } -// } - -// if(!isExcludedPage) -// { -// if(getRequestURI.contains(".js")){ -// isExcludedPage = true; -// } -// } - if(!isExcludedPage) { - if(uncheckurl_list==null || uncheckurl_list.size() == 0){ - - String uncheck_init = bb.getPropValue("weaver_session_filter","uncheckurl"); - if(!"".equals(uncheck_init)){ - - String[] uncheck_url_arr = uncheck_init.split(";"); - for(int i=0;i headMap = new HashMap(); headMap.put("Cookie","SESSION="+uid); String msg = HttpRequestUtil.httpGet1(url,headMap,"UTF-8"); -// bb.writeLog("msg ==" + msg); - if(!"".equals(msg)) { JSONObject jsonObject = JSONObject.parseObject(msg); @@ -265,9 +165,7 @@ public class PortalLoginFilter implements Filter { JSONObject resultObject = jsonObject.getJSONObject("resultObject"); String staffCode = resultObject.getString("staffCode"); -// bb.writeLog("staffCode:"+staffCode); if(!"".equals(staffCode)){ - User user_new = null; String sql = "" ; if("admin".equals(staffCode)){ @@ -276,7 +174,7 @@ public class PortalLoginFilter implements Filter }else{ sql = " select * from HrmResource where loginid =? "; } - //bb.writeLog("sql:"+sql); + bb.writeLog("sql:"+sql); rs.executeQuery(sql,new Object[]{staffCode}); if(rs.next()){ user_new = new User(); @@ -325,16 +223,13 @@ public class PortalLoginFilter implements Filter request.getSession(true).setAttribute("weaver_user@bean", user_new); }else{ - response.setHeader("Access-Control-Allow-Origin", "*"); //解决跨域访问报错 response.setHeader("Access-Control-Allow-Methods", "POST, PUT, GET, OPTIONS, DELETE"); response.setHeader("Access-Control-Max-Age", "3600"); //设置过期时间 response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, client_id, uuid, Authorization"); response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // 支持HTTP 1.1. response.setHeader("Pragma", "no-cache"); // 支持HTTP 1.0. response.setHeader("Expires", "0"); - - //bb.writeLog("user is not in oa"); - response.sendRedirect("http://172.16.25.133/portal-web/#"); + response.sendRedirect(portal_homepage); return; } }else{ @@ -346,8 +241,7 @@ public class PortalLoginFilter implements Filter response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // 支持HTTP 1.1. response.setHeader("Pragma", "no-cache"); // 支持HTTP 1.0. response.setHeader("Expires", "0"); - //bb.writeLog("cookie user not in null"); - response.sendRedirect("http://172.16.25.133/portal-web/#"); + response.sendRedirect(portal_homepage); return; } }else{ @@ -358,9 +252,7 @@ public class PortalLoginFilter implements Filter response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, client_id, uuid, Authorization"); response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // 支持HTTP 1.1. response.setHeader("Pragma", "no-cache"); // 支持HTTP 1.0. response.setHeader("Expires", "0"); - - //bb.writeLog("cookie user not in null"); - response.sendRedirect("http://172.16.25.133/portal-web/#"); + response.sendRedirect(portal_homepage); return; } }else{ @@ -372,36 +264,12 @@ public class PortalLoginFilter implements Filter response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // 支持HTTP 1.1. response.setHeader("Pragma", "no-cache"); // 支持HTTP 1.0. response.setHeader("Expires", "0"); - response.sendRedirect("http://172.16.25.133/portal-web/#"); + response.sendRedirect(portal_homepage); return; } }catch (Exception e3){ bb.writeLog("e---2:"+e3); } - - -// try{ -// String url = "http://172.16.25.133/portal-web/user/current" ; -// HttpRequestUtil HttpRequestUtil = new HttpRequestUtil(); -// Map headMap = new HashMap(); -// headMap.put("Cookie","SESSION="+uid); -// String msg = HttpRequestUtil.sendGet(url,headMap,uid); -// bb.writeLog("msg2 ==" + msg); -// }catch (Exception e3){ -// bb.writeLog("e---3:"+e3); -// } -// -// try{ -// String url = "http://172.16.25.133/portal-web/user/current" ; -// HttpRequestUtil HttpRequestUtil = new HttpRequestUtil(); -// Map headMap = new HashMap(); -// headMap.put("Cookie","SESSION="+uid); -// String msg3 = HttpRequestUtil.sendPost(url,headMap,"UTF-8",uid); -// bb.writeLog("msg3 ==" + msg3); -// }catch (Exception e3){ -// bb.writeLog("e---2:"+e3); -// } - }else{ response.setHeader("Access-Control-Allow-Origin", "*"); //解决跨域访问报错 @@ -411,17 +279,13 @@ public class PortalLoginFilter implements Filter response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // 支持HTTP 1.1. response.setHeader("Pragma", "no-cache"); // 支持HTTP 1.0. response.setHeader("Expires", "0"); - //http://172.16.25.133/portal-web/ - String url = "http://172.16.25.133/portal-web/"; - //String url = "https://www.baidu.com"; - //response.setHeader("refresh", "0;url=" + url); + String url = portal_homepage; response.sendRedirect(url); return; - //response.setHeader("refresh", "0;url=" + url); } } } - } +// } filterChain.doFilter(request, response); } diff --git a/src/weaver/interfaces/mq/RocketMsgListener.java b/src/weaver/interfaces/mq/RocketMsgListener.java index 7ee9a442..72f1ed7b 100644 --- a/src/weaver/interfaces/mq/RocketMsgListener.java +++ b/src/weaver/interfaces/mq/RocketMsgListener.java @@ -27,9 +27,6 @@ public class RocketMsgListener implements MessageListenerConcurrently { String data = msgdata.substring(msgdata.indexOf("{")); int errcount = rocketmqUtil.updateOrgData(data); bb.writeLog("Consumer---errcount---:"+errcount); -// if(errcount >0){ -// return ConsumeConcurrentlyStatus.RECONSUME_LATER; -// } } } catch (UnsupportedEncodingException e) { e.printStackTrace(); diff --git a/src/weaver/interfaces/mq/RocketmqServlet.java b/src/weaver/interfaces/mq/RocketmqServlet.java index dcf24b2c..83f5383c 100644 --- a/src/weaver/interfaces/mq/RocketmqServlet.java +++ b/src/weaver/interfaces/mq/RocketmqServlet.java @@ -21,6 +21,7 @@ import java.util.Date; public class RocketmqServlet extends HttpServlet { + @Override public void init() throws ServletException { @@ -35,50 +36,33 @@ public class RocketmqServlet extends HttpServlet { try{ //DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("portal-producer-group_nj"); + //DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("cbec-consumer-group_nj_133"); + //consumer.setNamesrvAddr("172.16.84.183:9001;172.16.84.187:9001"); +// consumer.subscribe("dataSync_topic_nj", "BPM"); +// consumer.setInstanceName("dataSync_topic_nj"); - DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("cbec-consumer-group_nj_133"); + String consumerGroup = bb.getPropValue("PORTAL_INFO","consumerGroup"); + bb.writeLog("consumerGroup:"+consumerGroup); + DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(consumerGroup ); + String namesrvAddr = bb.getPropValue("PORTAL_INFO","namesrvAddr"); + bb.writeLog("namesrvAddr:"+namesrvAddr); + consumer.setNamesrvAddr(namesrvAddr); - consumer.setNamesrvAddr("172.16.84.183:9001;172.16.84.187:9001"); - consumer.setInstanceName("dataSync_topic_nj"); + String instanceName = bb.getPropValue("PORTAL_INFO","instanceName"); + consumer.setInstanceName(instanceName); consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET); - consumer.subscribe("dataSync_topic_nj", "BPM"); + String topic = bb.getPropValue("PORTAL_INFO","topic"); + String subExpression = bb.getPropValue("PORTAL_INFO","subExpression"); + consumer.subscribe(topic, subExpression); consumer.setConsumeThreadMin(1); consumer.setConsumeThreadMax(1); consumer.setConsumeMessageBatchMaxSize(1); consumer.setMessageModel(MessageModel.BROADCASTING); - -// RocketmqUtil rocketmqUtil = new RocketmqUtil(); - bb.writeLog("Consumer begin."); - consumer.registerMessageListener(new RocketMsgListener()); -// consumer.registerMessageListener(new MessageListenerConcurrently() { -// @Override -// public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { -// MessageExt msg = msgs.get(0); -// try { -// bb.writeLog("Consumer---3----"+new String(msg.getBody())); -// String msgdata = new String(msg.getBody(),"UTF-8"); -// if(!"".equals(msgdata)) -// { -// String data = msgdata.substring(msgdata.indexOf("{")); -// int errcount = rocketmqUtil.updateOrgData(data); -// if(errcount >0){ -// return ConsumeConcurrentlyStatus.RECONSUME_LATER; -// } -// } -// } catch (UnsupportedEncodingException e) { -// e.printStackTrace(); -// bb.writeLog("Consumer---UnsupportedEncodingException---e:"+e); -// return ConsumeConcurrentlyStatus.RECONSUME_LATER; -// } -// return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; -// } -// }); - /** * Consumer对象在使用之前必须要调用start初始化，初始化一次即可
*/ @@ -92,7 +76,6 @@ public class RocketmqServlet extends HttpServlet { bb.writeLog("***** resource model initiated"); bb.writeLog("***** resource model initiated"); bb.writeLog("***** resource model initiated"); - } @@ -103,6 +86,7 @@ public class RocketmqServlet extends HttpServlet { * @throws ServletException * @throws IOException */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doPost(request, response); } @@ -115,9 +99,11 @@ public class RocketmqServlet extends HttpServlet { * @throws IOException */ + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { } + @Override public void destroy() { // 什么也不做 diff --git a/src/weaver/interfaces/mq/RocketmqUtil.java b/src/weaver/interfaces/mq/RocketmqUtil.java index 74ccf78b..ee0b3371 100644 --- a/src/weaver/interfaces/mq/RocketmqUtil.java +++ b/src/weaver/interfaces/mq/RocketmqUtil.java @@ -72,9 +72,6 @@ public class RocketmqUtil { bb.writeLog("errcount2:"+errcount2); errcount += errcount2; } - - - } } } diff --git a/src/weaver/interfaces/qt/Consumer.java b/src/weaver/interfaces/qt/Consumer.java deleted file mode 100644 index 55ac1bea..00000000 --- a/src/weaver/interfaces/qt/Consumer.java +++ /dev/null @@ -1,134 +0,0 @@ -package weaver.interfaces.qt; - -import com.alibaba.rocketmq.client.consumer.DefaultMQPushConsumer; -import com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; -import com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; -import com.alibaba.rocketmq.client.consumer.listener.MessageListenerConcurrently; -import com.alibaba.rocketmq.client.exception.MQClientException; -import com.alibaba.rocketmq.common.consumer.ConsumeFromWhere; -import com.alibaba.rocketmq.common.message.MessageExt; -import com.alibaba.rocketmq.common.protocol.heartbeat.MessageModel; - -import java.io.*; -import java.util.List; - -public class Consumer { - /** - * 内部是使用长轮询Pull方式从MetaQ服务器拉消息，然后再回调用户Listener方法
- */ - public static void main(String[] args) throws InterruptedException, - MQClientException { - /** - * 一个应用创建一个Consumer，由应用来维护此对象，可以设置为全局对象或者单例
- * 注意：ConsumerGroupName需要由应用来保证唯一。 - *不同consumer group里的consumer即便是消费同一个topic下的同一个queue， - *那消费进度也是分开存储的。也就是说，不同的consumer group内的consumer的消费 - *完全隔离，彼此不受影响。 - */ - - -// mq.datasync.topic=dataSync_topic_nj -// ctgmq.producer.common.producerGroupName=portal-producer-group_nj -// ctgmq.producer.common.instanceName=dataSync_topic_nj -// ctgmq.producer.common.namesrvAddr=172.16.84.183:9001;172.16.84.187:9001 -// ctgmq.producer.common.authId=rul -// ctgmq.producer.common.authPwd=rul -// ctgmq.producer.common.clusterName=CtgMQ_01 -// ctgmq.producer.common.tenantID=100000 - - - DefaultMQPushConsumer consumer = new DefaultMQPushConsumer( - "cbec-consumer-group_nj_133"); - consumer.setNamesrvAddr("172.16.84.183:9001;172.16.84.187:9001"); - //consumer.setInstanceName("dataSync_topic_nj"); - consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET); - - - //广播消费是指一个consumer只要订阅了某个topic的消息，那它就会收到该topic下的所有queue里的消息， - //而不管这个consumer的group是什么。所以对于广播消费来说，consumer group没什么实际意义。consumer可以在实例化时，我们可以指定是集群消费还是广播消费。 - //consumer.setMessageModel(MessageModel.BROADCASTING); - - consumer.setMessageModel(MessageModel.BROADCASTING); - - /** - * 订阅指定topic下tags分别等于TagA或TagC或TagD - */ - //consumer.subscribe("dataSync_topic_nj", "TagA || TagC || TagD"); - /** - * 订阅指定topic下所有消息
- * 注意：一个consumer对象可以订阅多个topic - */ - - consumer.setConsumeMessageBatchMaxSize(1); - //关闭VIP通道，避免接收不了消息 - - consumer.subscribe("dataSync_topic_nj", "BPM"); - - int i = 0; - - String path = "C:\\Users\\Administrator\\Desktop\\demo10.txt"; - - - consumer.registerMessageListener(new MessageListenerConcurrently() { - /** - * 默认msgs里只有一条消息，可以通过设置consumeMessageBatchMaxSize参数来批量接收消息 - */ - - @Override - public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { -// System.out.println(Thread.currentThread().getName() -// + " Receive New Messages: " + msgs.size()); - MessageExt msg = msgs.get(0); - - try { -// System.out.println("11----"+new String(msg.getBody(), StandardCharsets.UTF_8)); -// System.out.println("11----"+new String(msg.toString())); -// System.out.println("1----"+new String(msg.getBody(),"UTF-8")); -// System.out.println("2----"+new String(msg.getBody(),"GBK")); - System.out.println("3----"+new String(msg.getBody())); - - - String msgdata = new String(msg.getBody(),"UTF-8"); - -// System.out.println("5----"+msgdata.substring(msgdata.indexOf("{"))); - - if(!"".equals(msgdata)){ - String data = msgdata.substring(msgdata.indexOf("{")); - //SymOrgUserData.updasteSysOrgData(data); - System.out.println(data); - System.out.println(context.getMessageQueue().toString()); - - BufferedWriter out = null; - try { - out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(path,true))); - out.write(data+"\r\n"); - out.close(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - System.out.println(e); - } catch (IOException e) { - e.printStackTrace(); - System.out.println(e); - } - } - - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - System.out.println(e); - } - - return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; - } - }); - - /** - * Consumer对象在使用之前必须要调用start初始化，初始化一次即可
- */ - consumer.start(); - System.out.println("Consumer Started."); - } - - - - -} \ No newline at end of file diff --git a/src/weaver/interfaces/qt/Consumer2.java b/src/weaver/interfaces/qt/Consumer2.java deleted file mode 100644 index f01034c3..00000000 --- a/src/weaver/interfaces/qt/Consumer2.java +++ /dev/null @@ -1,107 +0,0 @@ -package weaver.interfaces.qt; - -//import com.alibaba.rocketmq.client.consumer.DefaultMQPushConsumer; -//import com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; -//import com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; -//import com.alibaba.rocketmq.client.consumer.listener.MessageListenerConcurrently; -//import com.alibaba.rocketmq.client.exception.MQClientException; -//import com.alibaba.rocketmq.common.message.MessageExt; -//import com.alibaba.rocketmq.remoting.common.RemotingHelper; - -import java.util.List; - -public class Consumer2 { - /** - * 内部是使用长轮询Pull方式从MetaQ服务器拉消息，然后再回调用户Listener方法
- */ -// public static void main(String[] args) throws InterruptedException, -// MQClientException { -// /** -// * 一个应用创建一个Consumer，由应用来维护此对象，可以设置为全局对象或者单例
-// * 注意：ConsumerGroupName需要由应用来保证唯一。 -// *不同consumer group里的consumer即便是消费同一个topic下的同一个queue， -// *那消费进度也是分开存储的。也就是说，不同的consumer group内的consumer的消费 -// *完全隔离，彼此不受影响。 -// */ -// -// -//// mq.datasync.topic=dataSync_topic_nj -//// ctgmq.producer.common.producerGroupName=portal-producer-group_nj -//// ctgmq.producer.common.instanceName=dataSync_topic_nj -//// ctgmq.producer.common.namesrvAddr=172.16.84.183:9001;172.16.84.187:9001 -//// ctgmq.producer.common.authId=rul -//// ctgmq.producer.common.authPwd=rul -//// ctgmq.producer.common.clusterName=CtgMQ_01 -//// ctgmq.producer.common.tenantID=100000 -// -// -// DefaultMQPushConsumer consumer = new DefaultMQPushConsumer( -// "portal-producer-group_nj" ); -// consumer.setNamesrvAddr("172.16.84.183:9001"); -// consumer.setInstanceName("dataSync_topic_nj"); -// -// -// //广播消费是指一个consumer只要订阅了某个topic的消息，那它就会收到该topic下的所有queue里的消息， -// //而不管这个consumer的group是什么。所以对于广播消费来说，consumer group没什么实际意义。consumer可以在实例化时，我们可以指定是集群消费还是广播消费。 -// //consumer.setMessageModel(MessageModel.BROADCASTING); -// /** -// * 订阅指定topic下tags分别等于TagA或TagC或TagD -// */ -// //consumer.subscribe("dataSync_topic_nj", "TagA || TagC || TagD"); -// /** -// * 订阅指定topic下所有消息
-// * 注意：一个consumer对象可以订阅多个topic -// */ -// consumer.subscribe("dataSync_topic_nj", "*"); -// consumer.registerMessageListener(new MessageListenerConcurrently() { -// /** -// * 默认msgs里只有一条消息，可以通过设置consumeMessageBatchMaxSize参数来批量接收消息 -// */ -// @Override -// public ConsumeConcurrentlyStatus consumeMessage( -// List msgs, ConsumeConcurrentlyContext context) { -// System.out.println(Thread.currentThread().getName() -// + " Receive New Messages: " + msgs.size()); -// MessageExt messageExt = msgs.get(0); -// -// -// try { -// String id = messageExt.getMsgId(); -// String topic = messageExt.getTopic(); -// String tags = messageExt.getTags(); -// String keys = messageExt.getKeys(); -// String msgBody = new String(messageExt.getBody()); -// //模拟失败 -// if ("key5".equals(keys)) { -// System.out.println(1 / 0); -// } -// System.out.println("topic: " + topic + ",tags: " + tags + ", id:" + id + ",keys: " + keys + ", body: " + msgBody); -// } catch (Exception e) { -// //失败后，默认会隔 1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h 重试 -// e.printStackTrace(); -// int reconsumeTimes = messageExt.getReconsumeTimes();//失败重试次数 -// if (reconsumeTimes == 3) { -// //记录日志 ... -// System.out.println("消息ID:" + messageExt.getMsgId() + "失败三次，执行补偿策略"); -// //做补偿处理 -// //TODO -// return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; -// } -// return ConsumeConcurrentlyStatus.RECONSUME_LATER; -// } -// return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; -// -// //System.out.println(new String(messageExt.getBody())); -// //return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; -// } -// }); -// /** -// * Consumer对象在使用之前必须要调用start初始化，初始化一次即可
-// */ -// consumer.start(); -// System.out.println("Consumer Started."); -// } - - - -} \ No newline at end of file diff --git a/src/weaver/interfaces/qt/Consumer3.java b/src/weaver/interfaces/qt/Consumer3.java deleted file mode 100644 index eb18cc03..00000000 --- a/src/weaver/interfaces/qt/Consumer3.java +++ /dev/null @@ -1,61 +0,0 @@ -package weaver.interfaces.qt; - -//import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; -//import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; -//import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; -//import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; -//import org.apache.rocketmq.client.exception.MQClientException; -//import org.apache.rocketmq.common.message.MessageExt; -// -//import java.io.UnsupportedEncodingException; -//import java.util.List; - -public class Consumer3 { - /** - * 内部是使用长轮询Pull方式从MetaQ服务器拉消息，然后再回调用户Listener方法
- */ - public static void main(String[] args) { -// try{ -// -// DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("portal-producer-group_nj"); -// consumer.setNamesrvAddr("172.16.84.183:9001;172.16.84.187:9001"); -// consumer.setInstanceName("dataSync_topic_nj"); -// consumer.subscribe("dataSync_topic_nj", "*"); -// -//// RocketMsgListener msgListener = new RocketMsgListener(); -//// consumer.registerMessageListener(msgListener); -// -// -// consumer.registerMessageListener(new MessageListenerConcurrently() { -// @Override -// public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { -// MessageExt msg = msgs.get(0); -// try { -// System.out.println("3----"+new String(msg.getBody())); -// String msgdata = new String(msg.getBody(),"UTF-8"); -// if(!"".equals(msgdata)) -// { -// String data = msgdata.substring(msgdata.indexOf("{")); -// -// } -// } catch (UnsupportedEncodingException e) { -// e.printStackTrace(); -// return ConsumeConcurrentlyStatus.RECONSUME_LATER; -// } -// return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; -// } -// }); -// -// /** -// * Consumer对象在使用之前必须要调用start初始化，初始化一次即可
-// */ -// consumer.start(); -// -// }catch (MQClientException e){ -// } - } - - - - -} \ No newline at end of file diff --git a/src/weaver/interfaces/qt/RocketMqConsumer.java b/src/weaver/interfaces/qt/RocketMqConsumer.java deleted file mode 100644 index fbec76cc..00000000 --- a/src/weaver/interfaces/qt/RocketMqConsumer.java +++ /dev/null @@ -1,57 +0,0 @@ -package weaver.interfaces.qt; - - -//import com.alibaba.rocketmq.client.consumer.DefaultMQPushConsumer; -//import com.alibaba.rocketmq.client.consumer.listener.ConsumeOrderlyStatus; -//import com.alibaba.rocketmq.client.consumer.listener.MessageListenerOrderly; -//import com.alibaba.rocketmq.common.consumer.ConsumeFromWhere; -//import com.alibaba.rocketmq.common.message.MessageExt; -//import com.alibaba.rocketmq.common.protocol.heartbeat.MessageModel; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.FactoryBean; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.stereotype.Component; - -public class RocketMqConsumer { - -// private DefaultMQPushConsumer consumer; -// -// private final MessageModel messageModel = MessageModel.CLUSTERING; -// -// -// private String consumerGroupName = "portal-producer-group_nj"; -// private String instanceName = "dataSync_topic_nj" ; -// private String nameServerAddr = "172.16.84.183:9001;172.16.84.187:9001"; -// private int consumeThreadMin; -// private int consumeThreadMax; -// private String topicAndTags = "*" ; -// private int pullThresholdForQueue; -// private int pullBatchSize; -// -// -// public void afterPropertiesSet2() throws Exception { -// consumer = new DefaultMQPushConsumer(consumerGroupName); -// consumer.setInstanceName(instanceName); -// consumer.setMessageModel(messageModel); -// consumer.setNamesrvAddr(nameServerAddr); -// consumer.setConsumeThreadMax(consumeThreadMax); -// consumer.setConsumeThreadMin(consumeThreadMin); -// consumer.setPullBatchSize(pullBatchSize); -// consumer.setPullThresholdForQueue(pullThresholdForQueue); -// consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET); -// // 订阅的 topic 和 tags -// consumer.subscribe(topicAndTags, topicAndTags); -// // 注册监听方式 有序 -// consumer.registerMessageListener((MessageListenerOrderly) (messageExtList, consumeOrderlyContext) -> { -// MessageExt msg = messageExtList.get(0); -// String messageBody = new String(msg.getBody()); -// System.out.println("consume message, msgId={}, topic={}, tags={}, keys={},\n body={}"+ msg.getMsgId()+ msg.getTopic()+msg.getTags()+ msg.getKeys()+ messageBody); -// // todo: business code to consume message -// //yourService.xxx -// return ConsumeOrderlyStatus.SUCCESS; -// }); -// consumer.start(); -// System.out.println("rocketMQ consumer group [{}] started"+ consumerGroupName); -// } -} - diff --git a/src/weaver/interfaces/qt/RocketMsgOrderListener.java b/src/weaver/interfaces/qt/RocketMsgOrderListener.java deleted file mode 100644 index 6492f6a8..00000000 --- a/src/weaver/interfaces/qt/RocketMsgOrderListener.java +++ /dev/null @@ -1,39 +0,0 @@ -package weaver.interfaces.qt; - -import com.alibaba.rocketmq.client.consumer.listener.*; -import com.alibaba.rocketmq.common.message.MessageExt; -import weaver.general.BaseBean; - -import java.io.UnsupportedEncodingException; -import java.util.List; - - -public class RocketMsgOrderListener implements MessageListenerOrderly { - - @Override - public ConsumeOrderlyStatus consumeMessage(List msgs, ConsumeOrderlyContext consumeOrderlyContext) { - BaseBean bb = new BaseBean(); - MessageExt msg = msgs.get(0); - - RocketmqUtil2 rocketmqUtil = new RocketmqUtil2(); - - try { - - bb.writeLog("Consumer---3----"+new String(msg.getBody())); - String msgdata = new String(msg.getBody(),"UTF-8"); - if(!"".equals(msgdata)) - { - String data = msgdata.substring(msgdata.indexOf("{")); - int errcount = rocketmqUtil.updateOrgData(data); - if(errcount >0){ - return ConsumeOrderlyStatus.SUSPEND_CURRENT_QUEUE_A_MOMENT; - } - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - bb.writeLog("Consumer---UnsupportedEncodingException---e:"+e); - return ConsumeOrderlyStatus.SUSPEND_CURRENT_QUEUE_A_MOMENT; - } - return ConsumeOrderlyStatus.SUCCESS; - } -} diff --git a/src/weaver/interfaces/qt/RocketmqUtil2.java b/src/weaver/interfaces/qt/RocketmqUtil2.java deleted file mode 100644 index 1bfcb165..00000000 --- a/src/weaver/interfaces/qt/RocketmqUtil2.java +++ /dev/null @@ -1,496 +0,0 @@ -package weaver.interfaces.qt; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import weaver.conn.RecordSet; -import weaver.general.BaseBean; -import weaver.general.TimeUtil; -import weaver.general.Util; -import weaver.hrm.company.DepartmentComInfo; -import weaver.hrm.resource.ResourceComInfo; - -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -public class RocketmqUtil2 { - private Lock lock = new ReentrantLock(); - public int updateOrgData(String data) - { - lock.lock(); - BaseBean bb = new BaseBean(); - int errcount = 0; - - try{ - JSONObject jsonObject = JSONObject.parseObject(data); - if(jsonObject.containsKey("requestObject")) - { - JSONArray requestArray = jsonObject.getJSONArray("requestObject"); - for(int i=0;i