浏览代码

fix #1515 add permissions

Shinsuke Sugaya 7 年之前
父节点
当前提交
3215666607
共有 1 个文件被更改,包括 18 次插入0 次删除
  1. 18 0
      src/main/java/org/codelibs/fess/helper/ActivityHelper.java

+ 18 - 0
src/main/java/org/codelibs/fess/helper/ActivityHelper.java

@@ -15,11 +15,15 @@
  */
  */
 package org.codelibs.fess.helper;
 package org.codelibs.fess.helper;
 
 
+import static org.codelibs.core.stream.StreamUtil.stream;
+
 import java.time.ZonedDateTime;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
+import java.util.stream.Collectors;
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
 
 
+import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalThing;
 import org.dbflute.optional.OptionalThing;
@@ -36,6 +40,8 @@ public class ActivityHelper {
 
 
     protected String loggerName = "fess.log.audit";
     protected String loggerName = "fess.log.audit";
 
 
+    protected String permissionSeparator = "|";
+
     @PostConstruct
     @PostConstruct
     public void init() {
     public void init() {
         logger = LoggerFactory.getLogger(loggerName);
         logger = LoggerFactory.getLogger(loggerName);
@@ -48,6 +54,10 @@ public class ActivityHelper {
         buf.append('\t');
         buf.append('\t');
         buf.append("user:");
         buf.append("user:");
         buf.append(user.map(u -> u.getUserId()).orElse("-"));
         buf.append(user.map(u -> u.getUserId()).orElse("-"));
+        buf.append('\t');
+        buf.append("permissions:");
+        buf.append(user.map(u -> stream(u.getPermissions()).get(stream -> stream.collect(Collectors.joining(permissionSeparator))))
+                .filter(StringUtil::isNotBlank).orElse("-"));
         log(buf);
         log(buf);
     }
     }
 
 
@@ -58,6 +68,10 @@ public class ActivityHelper {
         buf.append('\t');
         buf.append('\t');
         buf.append("user:");
         buf.append("user:");
         buf.append(user.map(u -> u.getUserId()).orElse("-"));
         buf.append(user.map(u -> u.getUserId()).orElse("-"));
+        buf.append('\t');
+        buf.append("permissions:");
+        buf.append(user.map(u -> stream(u.getPermissions()).get(stream -> stream.collect(Collectors.joining(permissionSeparator))))
+                .filter(StringUtil::isNotBlank).orElse("-"));
         log(buf);
         log(buf);
     }
     }
 
 
@@ -98,4 +112,8 @@ public class ActivityHelper {
     public void setLoggerName(final String loggerName) {
     public void setLoggerName(final String loggerName) {
         this.loggerName = loggerName;
         this.loggerName = loggerName;
     }
     }
+
+    public void setPermissionSeparator(String permissionSeparator) {
+        this.permissionSeparator = permissionSeparator;
+    }
 }
 }