From 73904c8a84088bee10b151a811c0d7f1f05be386 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 5 Mar 2019 20:18:43 +0800 Subject: [PATCH] =?UTF-8?q?[MQ][=E4=BF=AE=E6=94=B9]:dev=E5=90=AF=E7=94=A8r?= =?UTF-8?q?abbitmq=EF=BC=8Ctest/prod=E5=90=AF=E7=94=A8rocketmq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxFlowAbleController.java | 16 ------------ .../iformall/mq/impl/RocketMqConsumer.java | 13 +--------- .../mq/impl/RocketMqMessageProducer.java | 10 ------- .../resources/mapper/MallUserInfoMapper.xml | 26 ------------------- 4 files changed, 1 insertion(+), 64 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java index 507fbe943..516177e4d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java @@ -1,13 +1,8 @@ package com.iformall.controller; import com.iformall.common.ResultData; -<<<<<<< HEAD -import com.iformall.mq.MessageProducer; -======= -import com.iformall.domain.po.WxCUserTags; import com.iformall.domain.po.WxFlowRecord; import com.iformall.enums.EnumFlowRecordStatus; ->>>>>>> [审批流][添加][添加合同提前终止审批] import com.iformall.service.WxFlowService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -30,18 +25,7 @@ public class WxFlowAbleController extends BaseController { @Autowired private WxFlowService wxFlowService; @Autowired -<<<<<<< HEAD - private MessageProducer messageProducer; - - @ApiOperation(value = "mqSend",notes = "") - @PostMapping("/mqSend") - public ResultData mqSend() { - messageProducer.sendMessage("aaaa","topic-1","tag-1","key1"); - return new ResultData(); - } -======= RuntimeService runtimeService; ->>>>>>> [铜锣湾][修改][预账单] @ApiOperation(value = "启动流程",notes = "{\"businessId\":\"221178539888607232\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"243650055783841792\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"\"}],\"variables\":[{\"key\":\"contractType\",\"value\":\"1\"},{\"key\":\"contractNumber\",\"value\":\"1111\"}]}") @PostMapping("/start") diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java index 003a64bf4..b480a4906 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java @@ -5,26 +5,15 @@ import com.iformall.mq.MqBaseConsumer; import lombok.extern.slf4j.Slf4j; import org.rocketmq.starter.annotation.RocketMQListener; import org.rocketmq.starter.annotation.RocketMQMessage; -<<<<<<< HEAD:mallinkService/src/main/java/com/iformall/mq/MqConsumer.java -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; -======= import org.springframework.context.annotation.Profile; ->>>>>>> add rabbitmq:mallinkService/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java @Slf4j @Profile(MQConfig.Impl.ROCKET_MQ) @RocketMQListener(topic = "topic-1") -<<<<<<< HEAD:mallinkService/src/main/java/com/iformall/mq/MqConsumer.java -public class MqConsumer { - private final Logger log = LoggerFactory.getLogger(this.getClass()); -======= public class RocketMqConsumer extends MqBaseConsumer { ->>>>>>> add rabbitmq:mallinkService/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java @RocketMQMessage(messageClass = String.class, tag = "tag-1") public void onMessage(String message) { - log.info("received message: {}", message); + doMessage(message); } } diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java index cf1a54df6..018470e12 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java @@ -23,18 +23,8 @@ import javax.annotation.PostConstruct; */ @Service @Slf4j -<<<<<<< HEAD -<<<<<<< HEAD:mallinkService/src/main/java/com/iformall/mq/MessageProducer.java -public class MessageProducer { - private final Logger log = LoggerFactory.getLogger(this.getClass()); - -======= -public class RocketMqMessageProducer { ->>>>>>> add rabbitmq:mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java -======= @Profile(MQConfig.Impl.ROCKET_MQ) public class RocketMqMessageProducer implements MqBaseProducer { ->>>>>>> [MQ][修改]:dev启用rabbitmq,test/prod启用rocketmq @Value("${spring.rocketmq.nameServer}") private String namesrvAddr; diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index dc94dd8f3..bf30fd4b9 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -13,18 +13,8 @@ -<<<<<<< HEAD -======= -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> [移动塔台登录][修改]:移动塔台登录修改 -======= - ->>>>>>> [微信第三方登录][修改]:是否绑定微信号 -======= ->>>>>>> [微信第三方登录][修改]:账户保护 @@ -33,24 +23,8 @@ -<<<<<<< HEAD -<<<<<<< HEAD - `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission` -======= - `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`bopen_id`,`web_open_id`,`flow_permission` ->>>>>>> [移动塔台登录][修改]:移动塔台登录修改 -======= `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`, -<<<<<<< HEAD -<<<<<<< HEAD - `bopen_id`,`web_open_id`,isnull(`web_open_id`) has_wechat ->>>>>>> [微信第三方登录][修改]:是否绑定微信号 -======= - `bopen_id`,`web_open_id`,isnull(`web_open_id`) with_wechat ->>>>>>> [微信第三方登录][修改]:with_chat修改 -======= `bopen_id`,`web_open_id` ->>>>>>> [微信第三方登录][修改]:账户保护