From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理
---
fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 477443b..9fdcf5f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -2,8 +2,9 @@
import java.io.BufferedReader;
import java.io.IOException;
+import java.io.PrintWriter;
import java.security.SignatureException;
-import java.util.Map;
+import java.util.Date;
import javax.annotation.Resource;
import javax.crypto.Mac;
@@ -14,9 +15,15 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+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.log.LogHelper;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
+import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONObject;
@@ -29,6 +36,11 @@
@Controller
@RequestMapping("client/v1/callback")
public class CallBackController {
+ @Resource
+ private ConfigService configService;
+
+ @Resource
+ private PushService pushService;
@Resource
private MsgDeviceReadStateService msgDeviceReadStateService;
@@ -68,6 +80,8 @@
e.printStackTrace();
}
+ LogHelper.test("缇庢唇:body----" + sb.toString());
+
String sign = "";
try {
sign = sign(sb.toString());
@@ -91,11 +105,22 @@
else if (contentType.equalsIgnoreCase("audio"))
msg = "[璇煶]";
String customizedId = json.optJSONObject("customizedData").optString("璁惧鏍囪瘑");
+ String uid = json.optJSONObject("customizedData").optString("鐢ㄦ埛ID");
msgDeviceReadStateService.addUnreadDeviceMsg(MsgDeviceReadState.TYPE_KEFU, customizedId,
- "android".equalsIgnoreCase(deviceOS) ? 1 : 2, 1, msg);
+ "android".equalsIgnoreCase(deviceOS) ? 1 : 2, 1, msg, new Date());
+ if (!StringUtil.isNullOrEmpty(uid))// 鎺ㄩ�佸鏈嶆秷鎭�
+ {
+ PushContentDTO dto = PushMsgFactory.createMsgKefu();
+ try {
+ pushService.pushZNX(Long.parseLong(uid), dto.getTitle(), dto.getContent(), null, null);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ } catch (PushException e) {
+ e.printStackTrace();
+ }
+ }
}
- LogHelper.test("缇庢唇:body----" + sb.toString());
}
public String sign(String raw_body) throws java.security.SignatureException {
@@ -114,4 +139,15 @@
return "meiqia_sign:" + result;
}
+ @RequestMapping(value = "test")
+ public void test(PrintWriter out) {
+ configService.getConfig(1L);
+ out.print("success");
+ }
+
+ @RequestMapping(value = "vip")
+ public void VIP(PrintWriter out) {
+ out.print("success");
+ }
+
}
--
Gitblit v1.8.0