From 9666caad786d890ace2df4594e71cee47bb489b9 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期五, 23 十一月 2018 09:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
index ed84edc..b0a3ec9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -226,17 +226,22 @@
}
@RequestMapping("findThreeFriendsCount")
- public void findThreeFriendsCount(long id, PrintWriter out) {
+ public void findThreeFriendsCount(long id, String callback, PrintWriter out) {
int count1 = userInfoService.findFriendsCount(id, 1);
int count2 = userInfoService.findFriendsCount(id, 2);
JSONObject data = new JSONObject();
data.put("count1", count1);
data.put("count2", count2);
- out.print(JsonUtil.loadTrueResult(data));
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(data));
+ }
}
@RequestMapping("findThreeFriends")
- public void findThreeFriends(long id, int type, int page, PrintWriter out) {
+ public void findThreeFriends(long id, int type, int page, String callback, PrintWriter out) {
int pageSize = 30;
List<InviteUser> list = userInfoService.getFriendsList(id, type, page, pageSize);
JSONArray array = new JSONArray();
@@ -251,7 +256,11 @@
JSONObject data = new JSONObject();
data.put("list", array);
data.put("pages", count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
- out.print(JsonUtil.loadTrueResult(data));
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(data));
+ }
}
@RequestMapping("findThreeSales")
--
Gitblit v1.8.0