From b784175e978b0fcfca8ca8bed7953ae4eacf49e8 Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期一, 02 九月 2019 20:18:58 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/java/com/java110/web/components/MenuComponent.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/MenuComponent.java b/WebService/src/main/java/com/java110/web/components/MenuComponent.java
index 8d06306..f0abb59 100644
--- a/WebService/src/main/java/com/java110/web/components/MenuComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/MenuComponent.java
@@ -1,6 +1,5 @@
package com.java110.web.components;
-import com.alibaba.fastjson.JSONArray;
import com.java110.core.context.IPageData;
import com.java110.web.smo.IMenuServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +19,10 @@
/**
* 娴嬭瘯鐗堟湰鍙�
+ *
* @return
*/
- public ResponseEntity<String> getMenus(IPageData pd){
+ public ResponseEntity<String> getMenus(IPageData pd) {
/* String menuData = "[{'id':1,'icon':'fa-desktop','name':'鎴戠殑鑿滃崟','label':'HOT','childs':[" +
"{'name':'瀛愯彍鍗�','href':'http://www.baidu.com'}]}," +
@@ -36,11 +36,11 @@
*/
ResponseEntity<String> responseEntity = null;
- try{
- responseEntity = menuServiceSMOImpl.queryMenusByUserId(pd);
- }catch (Exception e){
+ try {
+ responseEntity = menuServiceSMOImpl.queryMenusByUserId(pd);
+ } catch (Exception e) {
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
- }finally {
+ } finally {
return responseEntity;
}
}
--
Gitblit v1.8.0