# Conflicts: # ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitConstant.java # xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitActivityConfig.java