From 2ece6f6cd23d7b717881dd54a9fc74877096ecee Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期一, 07 五月 2018 23:13:59 +0800
Subject: [PATCH] 控制服务实现登录功能 和菜单展示，以及中心服务bug修复
---
java110-core/src/main/java/com/java110/core/base/controller/BaseController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java b/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
index 0af9aaa..ba9a01b 100644
--- a/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
+++ b/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
@@ -2,12 +2,14 @@
import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.CommonConstant;
import com.java110.common.constant.ResponseConstant;
import com.java110.common.exception.NoAuthorityException;
import com.java110.common.factory.PageDataFactory;
import com.java110.common.log.LoggerEngine;
import com.java110.common.util.SequenceUtil;
+import com.java110.common.util.StringUtil;
import com.java110.core.base.AppBase;
import com.java110.entity.service.PageData;
import org.springframework.util.StringUtils;
@@ -29,11 +31,10 @@
* 妫�鏌ョ敤鎴风櫥褰�
* @throws NoAuthorityException
*/
- protected String checkLogin() throws NoAuthorityException{
- if(false){
+ protected void checkLogin(PageData pd) throws NoAuthorityException{
+ if(StringUtil.isNullOrNone(pd.getUserId())){
throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR,"鐢ㄦ埛鏈櫥褰曪紝璇风櫥褰曪紒");
}
- return "10001";
}
@@ -128,7 +129,10 @@
* @throws IllegalArgumentException
*/
protected PageData getPageData(HttpServletRequest request){
- return request.getAttribute("pd") != null ?(PageData) request.getAttribute("pd") : null;
+ if(request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA) == null){
+ throw new IllegalArgumentException("璇锋眰鍙傛暟閿欒");
+ }
+ return (PageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
}
}
--
Gitblit v1.8.0