修改fetchAt方法的正则

atjiu · Dec 6, 2016 · 2f0988a · 2f0988a
1 parent b69feb7
commit 2f0988a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/cn/tomoya/common/BaseEntity.java b/src/main/java/cn/tomoya/common/BaseEntity.java
@@ -65,11 +65,11 @@ public String marked(String content) {
      */
     public static List<String> fetchUsers(String str) {
         List<String> ats = new ArrayList<>();
-        String pattern = "@";
+        String pattern = "@[^\\s]+\\s?";
         Pattern regex = Pattern.compile(pattern);
         Matcher regexMatcher = regex.matcher(str);
         while (regexMatcher.find()) {
-            ats.add(regexMatcher.group(1));
+            ats.add(regexMatcher.group());
         }
         return ats;
     }

diff --git a/src/main/java/cn/tomoya/template/package-info.java b/src/main/java/cn/tomoya/template/package-info.java
@@ -0,0 +1,10 @@
+/**
+ * Created by tomoya.
+ * Copyright (c) 2016, All Rights Reserved.
+ * http://tomoya.cn
+ */
+package cn.tomoya.template;
+
+/**
+ 这个包是做freemarker自定义标签的，暂时没有在系统里用到，先保留
+ */