周浩 9 سال پیش
والد
کامیت
c5a2f63c60

+ 23 - 2
hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/GenericPo.java

@@ -9,7 +9,10 @@ import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
 import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 /**
  * 通用的PO对象,实现基本的属性和方法。新建的PO都应继承该类
@@ -26,6 +29,17 @@ public class GenericPo<PK> implements Serializable {
         return u_id;
     }
 
+    private Map<String, Object> customAttr = new LinkedHashMap<>();
+
+    public <T> T attr(String attr, T value) {
+        customAttr.put(attr, value);
+        return value;
+    }
+
+    public <T> T attr(String attr) {
+        return ((T) customAttr.get(attr));
+    }
+
     @Override
     public int hashCode() {
         if (getU_id() == null) return 0;
@@ -42,12 +56,12 @@ public class GenericPo<PK> implements Serializable {
     }
 
     /**
-     * 创建一个主键,根据当前时戳和随机数的一个MD5值
+     * 创建一个主键
      *
      * @return
      */
     public static String createUID() {
-        return MD5.encode(String.valueOf(System.nanoTime()) + String.valueOf(Math.random()));
+        return MD5.encode(UUID.randomUUID().toString());
     }
 
     /**
@@ -78,4 +92,11 @@ public class GenericPo<PK> implements Serializable {
         return valid(this);
     }
 
+    public Map<String, Object> getCustomAttr() {
+        return customAttr;
+    }
+
+    public void setCustomAttr(Map<String, Object> customAttr) {
+        this.customAttr = customAttr;
+    }
 }

+ 1 - 1
hsweb-web-core/src/main/java/org/hsweb/web/authorize/annotation/AccessLogger.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.authorize.annotation;
+package org.hsweb.web.logger.annotation;
 
 /**
  * Created by 浩 on 2016-01-16 0016.

+ 0 - 1
hsweb-web-core/src/main/java/org/hsweb/web/message/ResponseMessage.java

@@ -9,7 +9,6 @@ import org.webbuilder.utils.common.DateTimeUtils;
 
 import java.io.Serializable;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 响应消息。controller中处理后,返回此对象,响应请求结果给客户端。

+ 1 - 1
hsweb-web-websocket/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 #LOGGING
 logging:
   config: classpath:logback.xml
-  path: /var/logger/hsweb
+  path: ~/hsweb/logger/