Merge remote-tracking branch 'origin/hph' into zs

src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java

@@ -46,7 +46,7 @@ public class NotifyController {
     }
 
     @RequestMapping("fstmemberInCallBack")
-    public String fstmemberInCallBack(HttpServletRequest request){
+    public String fstmemberInCallBack(HttpServletRequest request) throws Exception {
         Map<String, Object> map= getParameterMap(request);
         log.info("fstmemberInCallBack回调返回信息:{}",JSONUtil.toJsonStr(map));
         if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"000000".equals(map.get("code")+"")){

src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitProducer.java

@@ -19,6 +19,8 @@ public class RabbitProducer implements RabbitTemplate.ConfirmCallback  {
     private RabbitTemplate rabbitTemplate;
     @Value("${prod}")
     private String prod;
+
+
     @Autowired
     public RabbitProducer(RabbitTemplate rabbitTemplate) {
         this.rabbitTemplate = rabbitTemplate;