From 6bf4c9ae79180f7ba77a9159553dff5fab412bc8 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期二, 20 十一月 2018 12:14:14 +0800
Subject: [PATCH] 迁移:短链转换

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
index 0c334a4..7d3731a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
@@ -138,17 +138,26 @@
 	 * @param out
 	 * @throws Exception
 	 */
-	@RequestMapping(value = "convertLink", method = RequestMethod.POST)
-	public void convertLink(String url, PrintWriter out) throws Exception {
+	@RequestMapping(value = "convertLink")
+	public void convertLink(String callback, String url, PrintWriter out) {
 
-		String shortLink = org.yeshi.utils.HttpUtil.getShortLink(url);
+		if (StringUtil.isNullOrEmpty(url)) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("杞摼鏁版嵁涓嶈兘涓虹┖"));
+			return;
+		}
+		
+		try {
+			String shortLink = org.yeshi.utils.HttpUtil.getShortLink(url);
 
-		JSONObject jsonData = new JSONObject();
-		jsonData.put("url", url);
-		jsonData.put("shortLink", shortLink);
-
-		out.print(JsonUtil.loadTrueResult(jsonData));
-
+			JSONObject jsonData = new JSONObject();
+			jsonData.put("url", url);
+			jsonData.put("shortLink", shortLink);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(jsonData));
+			
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("杞崲澶辫触"));
+			e.printStackTrace();
+		}
 	}
 
 	

--
Gitblit v1.8.0