From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 61a90e8..57cd286 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -2,6 +2,7 @@
import java.io.BufferedReader;
import java.io.IOException;
+import java.io.PrintWriter;
import java.security.SignatureException;
import java.util.Date;
@@ -16,6 +17,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
import net.sf.json.JSONObject;
@@ -29,6 +31,8 @@
@Controller
@RequestMapping("client/v1/callback")
public class CallBackController {
+ @Resource
+ private ConfigService configService;
@Resource
private MsgDeviceReadStateService msgDeviceReadStateService;
@@ -67,6 +71,8 @@
} catch (IOException e) {
e.printStackTrace();
}
+
+ LogHelper.test("缇庢唇:body----" + sb.toString());
String sign = "";
try {
@@ -92,10 +98,10 @@
msg = "[璇煶]";
String customizedId = json.optJSONObject("customizedData").optString("璁惧鏍囪瘑");
msgDeviceReadStateService.addUnreadDeviceMsg(MsgDeviceReadState.TYPE_KEFU, customizedId,
- "android".equalsIgnoreCase(deviceOS) ? 1 : 2, 1, msg,new Date());
+ "android".equalsIgnoreCase(deviceOS) ? 1 : 2, 1, msg, new Date());
}
- LogHelper.test("缇庢唇:body----" + sb.toString());
+
}
public String sign(String raw_body) throws java.security.SignatureException {
@@ -114,4 +120,10 @@
return "meiqia_sign:" + result;
}
+ @RequestMapping(value = "test")
+ public void test(PrintWriter out) {
+ configService.getConfig(1L);
+ out.print("success");
+ }
+
}
--
Gitblit v1.8.0