Merge pull request #78 from lbay2015/lbay

Apphub user behavior record add info & fix Apphub ajax assembly params not default
uavorg · Nov 24, 2017 · 3561c2c · 3561c2c
2 parents 15ef2ab + 5a55c68
commit 3561c2c
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 4 deletions.
diff --git a/...itease.uav.console/src/main/java/com/creditease/uav/apphub/filter/SessionAsyncFilter.java b/...itease.uav.console/src/main/java/com/creditease/uav/apphub/filter/SessionAsyncFilter.java
@@ -263,7 +263,11 @@ private void userLoggerInfo(HttpServletRequest request) {
         userInfo.put("type", actiontype);
         userInfo.put("url", actionurl);
         userInfo.put("desc", actiondesc);
-
+        userInfo.put("authemails", String
+                .valueOf(request.getSession(false).getAttribute("apphub.gui.session.login.user.authorize.emailList")));
+        userInfo.put("authsystems", String
+                .valueOf(request.getSession(false).getAttribute("apphub.gui.session.login.user.authorize.systems")));
+
         logger.info(this, JSONHelper.toString(userInfo));
     }
 

diff --git a/com.creditease.uav.console/src/main/java/com/creditease/uav/apphub/rest/GUIService.java b/com.creditease.uav.console/src/main/java/com/creditease/uav/apphub/rest/GUIService.java
@@ -169,11 +169,17 @@ public String loadTemp(@QueryParam("tempName") String tempName) throws Exception
         if (null != userId) {
             Object userGroup = null == session ? null : session.getAttribute("apphub.gui.session.login.user.group");
             Object emailList = null == session ? null : session.getAttribute("apphub.gui.session.login.user.emailList");
+            Object emailAuthList = null == session ? null
+                    : session.getAttribute("apphub.gui.session.login.user.authorize.emailList");
+            Object systemAuthList = null == session ? null
+                    : session.getAttribute("apphub.gui.session.login.user.authorize.systems");
+
             /**
              * 模板中，自动填充登录用户信息：模板内spa页面可以获取此资源;
              */
             String userJs = "<script> var loginUser = {" + "'userId':'" + userId + "','groupId':'" + userGroup
-                    + "','emailList':'" + emailList + "'};</script>";
+                    + "','emailList':'" + emailList + "','emailAuthList':'" + emailAuthList + "','systemAuthList':'"
+                    + systemAuthList + "'};</script>";
             tempHtml.append(userJs);
 
         }
@@ -221,6 +227,10 @@ else if (loginRegister(loginId, loginPwd, request)) {
             userInfo.put("type", "login");
             userInfo.put("url", "");
             userInfo.put("desc", "登录成功");
+            userInfo.put("uauthemails", String.valueOf(
+                    request.getSession(false).getAttribute("apphub.gui.session.login.user.authorize.emailList")));
+            userInfo.put("authsystems", String.valueOf(
+                    request.getSession(false).getAttribute("apphub.gui.session.login.user.authorize.systems")));
             logger.info(this, JSONHelper.toString(userInfo));
 
             return createResponeJson(RespCode.SUCCESS, "", "");
@@ -259,7 +269,11 @@ public void loginOut() {
             userInfo.put("rs", "/rs/gui/loginOut");
             userInfo.put("type", "logout");
             userInfo.put("url", "");
-            userInfo.put("desc", "登录成功");
+            userInfo.put("desc", "登出成功");
+            userInfo.put("uauthemails", String.valueOf(
+                    request.getSession(false).getAttribute("apphub.gui.session.login.user.authorize.emailList")));
+            userInfo.put("authsystems", String.valueOf(
+                    request.getSession(false).getAttribute("apphub.gui.session.login.user.authorize.systems")));
             logger.info(this, JSONHelper.toString(userInfo));
 
             // 销毁会话
@@ -393,6 +407,7 @@ protected boolean loginRegister(String loginId, String loginPwd, HttpServletRequ
             session.setAttribute("apphub.gui.session.login.user.id", userInfo.get("loginId"));
             session.setAttribute("apphub.gui.session.login.user.group", userInfo.get("groupId"));
             session.setAttribute("apphub.gui.session.login.user.emailList", userInfo.get("emailList"));
+            setUAuthInfoToSession();
             return true;
         }
         else {
@@ -758,5 +773,56 @@ public int compare(Map o1, Map o2) {
         });
         return jsonArray;
     }
+
+    /**
+     * 设置会话：用户授权邮箱组
+     */
+    @SuppressWarnings("unchecked")
+    private void setUAuthInfoToSession() {
+
+        // 用户信息会话创建，信息保存
+        HttpSession session = request.getSession(false);
+
+        String[] emailList = String
+                .valueOf(request.getSession(false).getAttribute("apphub.gui.session.login.user.emailList")).split(",");
+        if ("UAV.ADMIN.EMAIL.LIST".equals(emailList[0])) {
+            session.setAttribute("apphub.gui.session.login.user.authorize.emailList", "UAV.ADMIN.EMAIL.LIST");
+            session.setAttribute("apphub.gui.session.login.user.authorize.systems", "UAV.ADMIN.SYSTEMS");
+            return;
+        }
+
+        // 用户邮箱组权限
+        StringBuilder emailLists = new StringBuilder();
+        // 用户系统权限
+        StringBuilder systems = new StringBuilder();
+
+        for (String e : emailList) {
+            Map<String, String> esistsMap = cm.getHash("apphub.app.godeye.filter.cache", "email.list.group", e);
+            if (esistsMap.get(e) != null) {
+                Map<String, Object> emailMap = JSONHelper.toObject(esistsMap.get(e), Map.class);// 因为嵌套了一层，还需要再取一次
+                if (!"1".equals(String.valueOf(emailMap.get("state")))) { // 状态为可用
+                    continue;
+                }
+                if (emailLists.length() > 0) {
+                    emailLists.append(",");
+                }
+                emailLists.append(String.valueOf(emailMap.get("emailListName")));
+
+                /**
+                 * 系统组获取
+                 */
+                if (systems.length() > 0) {
+                    systems.append(",");
+                }
+                Map<String, Object> groups = JSONHelper.toObject(String.valueOf(emailMap.get("groupList")), Map.class);// 因为嵌套了一层，还需要再取一次
+                systems.append(groups.keySet().toString().substring(1, groups.keySet().toString().length() - 1));
+
+            }
+        }
+
+        session.setAttribute("apphub.gui.session.login.user.authorize.emailList", emailLists.toString());
+        session.setAttribute("apphub.gui.session.login.user.authorize.systems", systems.toString());
+
+    }
 
 }
diff --git a/com.creditease.uav.console/src/main/webapp/apphub/js/common/helper.js b/com.creditease.uav.console/src/main/webapp/apphub/js/common/helper.js
@@ -639,7 +639,7 @@ var AjaxHelper={
 			cache:cfg.cache,
 			data:cfg.data,
 			dataType:cfg.dataType,
-			contentType:cfg.contentType,
+			contentType:(typeof(value)=="undefined"?"application/json; charset=UTF-8":cfg.contentType),
 			beforeSend:function () {
 				timeOutId = setTimeout(function(){PageHelper.showLoading();},1000);
 		    },