| @@ -1,13 +1,8 @@ | |||||
| package com.iformall.controller; | package com.iformall.controller; | ||||
| import com.iformall.common.ResultData; | 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.domain.po.WxFlowRecord; | ||||
| import com.iformall.enums.EnumFlowRecordStatus; | import com.iformall.enums.EnumFlowRecordStatus; | ||||
| >>>>>>> [审批流][添加][添加合同提前终止审批] | |||||
| import com.iformall.service.WxFlowService; | import com.iformall.service.WxFlowService; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| @@ -30,18 +25,7 @@ public class WxFlowAbleController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxFlowService wxFlowService; | private WxFlowService wxFlowService; | ||||
| @Autowired | @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; | 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\"}]}") | @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") | @PostMapping("/start") | ||||
| @@ -5,26 +5,15 @@ import com.iformall.mq.MqBaseConsumer; | |||||
| import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||
| import org.rocketmq.starter.annotation.RocketMQListener; | import org.rocketmq.starter.annotation.RocketMQListener; | ||||
| import org.rocketmq.starter.annotation.RocketMQMessage; | 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; | import org.springframework.context.annotation.Profile; | ||||
| >>>>>>> add rabbitmq:mallinkService/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java | |||||
| @Slf4j | @Slf4j | ||||
| @Profile(MQConfig.Impl.ROCKET_MQ) | @Profile(MQConfig.Impl.ROCKET_MQ) | ||||
| @RocketMQListener(topic = "topic-1") | @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 { | public class RocketMqConsumer extends MqBaseConsumer { | ||||
| >>>>>>> add rabbitmq:mallinkService/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java | |||||
| @RocketMQMessage(messageClass = String.class, tag = "tag-1") | @RocketMQMessage(messageClass = String.class, tag = "tag-1") | ||||
| public void onMessage(String message) { | public void onMessage(String message) { | ||||
| log.info("received message: {}", message); | |||||
| doMessage(message); | |||||
| } | } | ||||
| } | } | ||||
| @@ -23,18 +23,8 @@ import javax.annotation.PostConstruct; | |||||
| */ | */ | ||||
| @Service | @Service | ||||
| @Slf4j | @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) | @Profile(MQConfig.Impl.ROCKET_MQ) | ||||
| public class RocketMqMessageProducer implements MqBaseProducer { | public class RocketMqMessageProducer implements MqBaseProducer { | ||||
| >>>>>>> [MQ][修改]:dev启用rabbitmq,test/prod启用rocketmq | |||||
| @Value("${spring.rocketmq.nameServer}") | @Value("${spring.rocketmq.nameServer}") | ||||
| private String namesrvAddr; | private String namesrvAddr; | ||||
| @@ -13,18 +13,8 @@ | |||||
| <result column="is_admin" jdbcType="INTEGER" property="isAdmin"/> | <result column="is_admin" jdbcType="INTEGER" property="isAdmin"/> | ||||
| <result column="nick_name" jdbcType="VARCHAR" property="nickName"/> | <result column="nick_name" jdbcType="VARCHAR" property="nickName"/> | ||||
| <result column="phone" jdbcType="VARCHAR" property="phone"/> | <result column="phone" jdbcType="VARCHAR" property="phone"/> | ||||
| <<<<<<< HEAD | |||||
| ======= | |||||
| <result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/> | <result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/> | ||||
| <result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/> | <result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/> | ||||
| <<<<<<< HEAD | |||||
| <<<<<<< HEAD | |||||
| >>>>>>> [移动塔台登录][修改]:移动塔台登录修改 | |||||
| ======= | |||||
| <result column="with_wechat" jdbcType="INTEGER" property="withWechat"/> | |||||
| >>>>>>> [微信第三方登录][修改]:是否绑定微信号 | |||||
| ======= | |||||
| >>>>>>> [微信第三方登录][修改]:账户保护 | |||||
| <result column="flow_permission" property="flowPermission"/> | <result column="flow_permission" property="flowPermission"/> | ||||
| </resultMap> | </resultMap> | ||||
| @@ -33,24 +23,8 @@ | |||||
| </sql> | </sql> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| <<<<<<< 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`, | `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` | `bopen_id`,`web_open_id` | ||||
| >>>>>>> [微信第三方登录][修改]:账户保护 | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||