From e021e32a6ff0ec216f69c24f7ea929798bdce4c5 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 05 十一月 2019 11:37:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java index 9fdcf5f..c02fbdd 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java @@ -18,7 +18,7 @@ import com.yeshi.fanli.dto.push.PushContentDTO; import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState; import com.yeshi.fanli.entity.config.push.PushMsgFactory; -import com.yeshi.fanli.exception.PushException; +import com.yeshi.fanli.exception.push.PushException; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService; @@ -150,4 +150,10 @@ out.print("success"); } + + @RequestMapping(value = "banlishop/pay") + public void banLiShopPay(PrintWriter out) { + out.print("success"); + } + } -- Gitblit v1.8.0