diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ChargeController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ChargeController.java index c021271e4..15c4af9ca 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ChargeController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/ChargeController.java @@ -2,6 +2,7 @@ package com.wzj.soopin.member.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.member.annotation.MemberFillMethod; import com.wzj.soopin.member.convert.ChargeConvert; import com.wzj.soopin.member.convert.MemberForbiddenConvert; import com.wzj.soopin.member.domain.bo.ChargeBO; @@ -33,6 +34,7 @@ public class ChargeController { @Tag(name = "查询列表") @PostMapping("/list") + @MemberFillMethod public R> list(@RequestBody ChargeBO bo, @RequestBody Page page) { Page pages = service.page(page, bo.toWrapper()); return R.ok(convert.toVO(pages)); @@ -47,6 +49,7 @@ public class ChargeController { @Tag(name = "详情") @GetMapping(value = "/{id}") + @MemberFillMethod public R getInfo(@PathVariable("id") Long id) { return R.ok(convert.toVO(service.getById(id))); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/WithdrawController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/WithdrawController.java index 59d4ba295..aacdde303 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/WithdrawController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/WithdrawController.java @@ -2,6 +2,7 @@ package com.wzj.soopin.member.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.member.annotation.MemberFillMethod; import com.wzj.soopin.member.convert.MemberForbiddenConvert; import com.wzj.soopin.member.convert.WithdrawConvert; import com.wzj.soopin.member.domain.bo.MemberForbiddenBO; @@ -33,6 +34,7 @@ public class WithdrawController { @Tag(name = "查询列表") @PostMapping("/list") + @MemberFillMethod public R> list(@RequestBody WithdrawBO bo, @RequestBody Page page) { Page pages = service.page(page, bo.toWrapper()); return R.ok(convert.toVO(pages)); @@ -47,6 +49,7 @@ public class WithdrawController { @Tag(name = "详情") @GetMapping(value = "/{id}") + @MemberFillMethod public R getInfo(@PathVariable("id") Long id) { return R.ok(convert.toVO(service.getById(id))); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/config/RocketMQConfiguration.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/config/RocketMQConfiguration.java index 2d30b5af9..c05032c64 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/config/RocketMQConfiguration.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/config/RocketMQConfiguration.java @@ -5,7 +5,6 @@ import org.apache.rocketmq.spring.autoconfigure.RocketMQAutoConfiguration; import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.apache.rocketmq.spring.support.RocketMQMessageConverter; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -34,17 +33,17 @@ public class RocketMQConfiguration { @Bean @ConditionalOnMissingBean(RocketMQTemplate.class) @ConditionalOnBean(DefaultMQProducer.class) - public RocketMQTemplate rocketMQTemplate(DefaultMQProducer mqProducer, + public RocketMQTemplate rocketMQTemplate(DefaultMQProducer mqProducer, RocketMQMessageConverter messageConverter) { RocketMQTemplate rocketMQTemplate = new RocketMQTemplate(); rocketMQTemplate.setProducer(mqProducer); rocketMQTemplate.setMessageConverter(messageConverter.getMessageConverter()); return rocketMQTemplate; } - + @Bean @ConditionalOnMissingBean(RocketMQMessageConverter.class) public RocketMQMessageConverter rocketMQMessageConverter() { return new RocketMQMessageConverter(); } -} \ No newline at end of file +}