diff --git a/dddlib-cache/dddlib-cache-api/pom.xml b/dddlib-cache/dddlib-cache-api/pom.xml
index e55ff53a1..6bd268441 100644
--- a/dddlib-cache/dddlib-cache-api/pom.xml
+++ b/dddlib-cache/dddlib-cache-api/pom.xml
@@ -8,9 +8,9 @@
dddlib-cache-api
DDDLib Cache API
-
+
高速缓存API
-
+
diff --git a/dddlib-cache/dddlib-cache-ehcache/pom.xml b/dddlib-cache/dddlib-cache-ehcache/pom.xml
index 45f14f48b..5f79b92c4 100644
--- a/dddlib-cache/dddlib-cache-ehcache/pom.xml
+++ b/dddlib-cache/dddlib-cache-ehcache/pom.xml
@@ -8,9 +8,9 @@
dddlib-cache-ehcache
DDDLib Cache implemented by EhCache
-
+
高速缓存,用EhCache实现。
-
+
diff --git a/dddlib-cache/dddlib-cache-memcached/pom.xml b/dddlib-cache/dddlib-cache-memcached/pom.xml
index e8b99cc8a..fe659de73 100644
--- a/dddlib-cache/dddlib-cache-memcached/pom.xml
+++ b/dddlib-cache/dddlib-cache-memcached/pom.xml
@@ -9,9 +9,9 @@
dddlib-cache-memcached
jar
DDDLib Cache implemented by memcached
-
+
高速缓存,用Memcached实现。
-
+
diff --git a/dddlib-cache/pom.xml b/dddlib-cache/pom.xml
index ccefdf818..06ed7cf89 100644
--- a/dddlib-cache/pom.xml
+++ b/dddlib-cache/pom.xml
@@ -9,9 +9,9 @@
dddlib-cache
pom
DDDLib Cache Module
-
+
高速缓存。
-
+
dddlib-cache-memcached
dddlib-cache-api
diff --git a/dddlib-configuration/pom.xml b/dddlib-configuration/pom.xml
index 40a0693ef..6b8e64124 100644
--- a/dddlib-configuration/pom.xml
+++ b/dddlib-configuration/pom.xml
@@ -9,9 +9,9 @@
dddlib-configuration
jar
DDDLib Configuration
-
+
定义配置接口Configuration(只读)及其子接口WritableConfiguration(可读写),并提供它们的各种实现类。
-
+
diff --git a/dddlib-datasource-monitor/pom.xml b/dddlib-datasource-monitor/pom.xml
index 25c703d7d..c751ef58b 100644
--- a/dddlib-datasource-monitor/pom.xml
+++ b/dddlib-datasource-monitor/pom.xml
@@ -9,9 +9,9 @@
dddlib-datasource-monitor
jar
DDDLib DataSource Monitor
-
+
数据源监控
-
+
diff --git a/dddlib-datasource-router/pom.xml b/dddlib-datasource-router/pom.xml
index 4509583a1..d5e0ca2e4 100644
--- a/dddlib-datasource-router/pom.xml
+++ b/dddlib-datasource-router/pom.xml
@@ -9,9 +9,9 @@
dddlib-datasource-router
jar
DDDLib Datasource Router classes for spring
-
+
数据源路由,主要用在SaaS环境,通过代理模式,将数据访问路由到租户对应的数据源。
-
+
diff --git a/dddlib-datasource-saas/pom.xml b/dddlib-datasource-saas/pom.xml
index 93b8adff8..01f1e9777 100644
--- a/dddlib-datasource-saas/pom.xml
+++ b/dddlib-datasource-saas/pom.xml
@@ -9,10 +9,10 @@
dddlib-datasource-saas
jar
DDDLib SaaS Datasource
-
+
SaaS数据源实现,主类是SaasDataSource,通过代理模式,将数据访问路由到租户对应的数据源。
与dddlib-datasource-router的目标一样,只是实现的方式不同。
-
+
diff --git a/dddlib-db/pom.xml b/dddlib-db/pom.xml
index 48a4d4189..1bf4640be 100644
--- a/dddlib-db/pom.xml
+++ b/dddlib-db/pom.xml
@@ -9,7 +9,7 @@
dddlib-db
jar
DDDLib Database Utils
- 数据库访问工具类
+ 数据库访问工具类
diff --git a/dddlib-domain/pom.xml b/dddlib-domain/pom.xml
index 32a9155a9..9ddb7e337 100644
--- a/dddlib-domain/pom.xml
+++ b/dddlib-domain/pom.xml
@@ -10,9 +10,9 @@
dddlib-domain
jar
DDDLib API Interfaces and Base Classes
-
+
DDDLib中最重要的模块,为基于DDD的开发提供核心接口和基类。
-
+
diff --git a/dddlib-event/dddlib-event-api/pom.xml b/dddlib-event/dddlib-event-api/pom.xml
index 5ead72b5b..dc9f58114 100644
--- a/dddlib-event/dddlib-event-api/pom.xml
+++ b/dddlib-event/dddlib-event-api/pom.xml
@@ -8,7 +8,7 @@
dddlib-event-api
jar
dddlib-event-api
- Domain Event API Module
+ Domain Event API Module
diff --git a/dddlib-event/dddlib-event-bus/pom.xml b/dddlib-event/dddlib-event-bus/pom.xml
index db42d2a58..3de61deab 100644
--- a/dddlib-event/dddlib-event-bus/pom.xml
+++ b/dddlib-event/dddlib-event-bus/pom.xml
@@ -8,7 +8,7 @@
dddlib-event-bus
jar
dddlib-event-bus
- Domain Event Bus Module
+ Domain Event Bus Module
diff --git a/dddlib-event/dddlib-event-sourcing/pom.xml b/dddlib-event/dddlib-event-sourcing/pom.xml
index bb2d617b0..222948e9f 100644
--- a/dddlib-event/dddlib-event-sourcing/pom.xml
+++ b/dddlib-event/dddlib-event-sourcing/pom.xml
@@ -8,7 +8,7 @@
dddlib-event-sourcing
jar
dddlib-event-sourcing
- Domain Event Sourcing Module
+ Domain Event Sourcing Module
diff --git a/dddlib-event/dddlib-event-storage/pom.xml b/dddlib-event/dddlib-event-storage/pom.xml
index b9e1ea81c..2f3a7ba55 100644
--- a/dddlib-event/dddlib-event-storage/pom.xml
+++ b/dddlib-event/dddlib-event-storage/pom.xml
@@ -8,7 +8,7 @@
dddlib-event-storage
jar
dddlib-event-storage
- Domain Event Storage Module
+ Domain Event Storage Module
diff --git a/dddlib-event/pom.xml b/dddlib-event/pom.xml
index 8f1ac0a5d..8de3827b4 100644
--- a/dddlib-event/pom.xml
+++ b/dddlib-event/pom.xml
@@ -8,7 +8,7 @@
dddlib-event
pom
dddlib-event
- Event Processing Module
+ Event Processing Module
dddlib-event-api
diff --git a/dddlib-examples/pom.xml b/dddlib-examples/pom.xml
index 824c2ec1e..126063492 100644
--- a/dddlib-examples/pom.xml
+++ b/dddlib-examples/pom.xml
@@ -10,7 +10,7 @@
dddlib-examples
pom
DDDLib Examples
- DDDLib usage examples.
+ DDDLib usage examples.
organisation-project
diff --git a/dddlib-excel/pom.xml b/dddlib-excel/pom.xml
index 445dcefc9..12951d033 100644
--- a/dddlib-excel/pom.xml
+++ b/dddlib-excel/pom.xml
@@ -10,7 +10,7 @@
dddlib-excel
jar
DDDLib Excel Date Import and Export Library
- Excel读写工具
+ Excel读写工具
diff --git a/dddlib-i18n/pom.xml b/dddlib-i18n/pom.xml
index 2462da0bd..94405f750 100644
--- a/dddlib-i18n/pom.xml
+++ b/dddlib-i18n/pom.xml
@@ -9,9 +9,9 @@
dddlib-i18n
jar
DDDLib I18N Interface and Implements
-
+
国际化和本地化支持。
-
+
diff --git a/dddlib-image/dddlib-image-api/pom.xml b/dddlib-image/dddlib-image-api/pom.xml
index 8b7c1c52d..91cf26dd5 100644
--- a/dddlib-image/dddlib-image-api/pom.xml
+++ b/dddlib-image/dddlib-image-api/pom.xml
@@ -8,6 +8,6 @@
4.0.0
dddlib-image-api
- image api接口
+ image api接口
\ No newline at end of file
diff --git a/dddlib-image/dddlib-image-cache/pom.xml b/dddlib-image/dddlib-image-cache/pom.xml
index 6728a2683..d9b6e6844 100644
--- a/dddlib-image/dddlib-image-cache/pom.xml
+++ b/dddlib-image/dddlib-image-cache/pom.xml
@@ -8,7 +8,7 @@
4.0.0
dddlib-image-cache
- 使用缓存做为图片存取的介质
+ 使用缓存做为图片存取的介质
diff --git a/dddlib-image/dddlib-image-file/pom.xml b/dddlib-image/dddlib-image-file/pom.xml
index d4cc1403c..1da882d16 100644
--- a/dddlib-image/dddlib-image-file/pom.xml
+++ b/dddlib-image/dddlib-image-file/pom.xml
@@ -8,7 +8,7 @@
4.0.0
dddlib-image-file
- Image存储的file本地实现
+ Image存储的file本地实现
diff --git a/dddlib-image/pom.xml b/dddlib-image/pom.xml
index 34bd26b2e..c35da845a 100644
--- a/dddlib-image/pom.xml
+++ b/dddlib-image/pom.xml
@@ -9,7 +9,7 @@
dddlib-image
pom
- 提供针对图片的存取工具类
+ 提供针对图片的存取工具类
dddlib-image-api
dddlib-image-cache
diff --git a/dddlib-ioc/dddlib-ioc-guice/pom.xml b/dddlib-ioc/dddlib-ioc-guice/pom.xml
index e4501cc74..5420b8f4f 100644
--- a/dddlib-ioc/dddlib-ioc-guice/pom.xml
+++ b/dddlib-ioc/dddlib-ioc-guice/pom.xml
@@ -9,9 +9,9 @@
dddlib-ioc-guice
jar
DDDLib IoC implemented by Google Guice
-
+
DDDLib IoC的Google Guice实现,通过GuiceInstanceProvider实现InstanceProvider
-
+
diff --git a/dddlib-ioc/dddlib-ioc-spring/pom.xml b/dddlib-ioc/dddlib-ioc-spring/pom.xml
index d68516bc9..571e23c02 100644
--- a/dddlib-ioc/dddlib-ioc-spring/pom.xml
+++ b/dddlib-ioc/dddlib-ioc-spring/pom.xml
@@ -9,9 +9,9 @@
dddlib-ioc-spring
jar
DDDLib IoC implemented by Springframework
-
+
DDDLib IoC的Spring实现,通过SpringInstanceProvider实现InstanceProvider。
-
+
diff --git a/dddlib-ioc/dddlib-ioc-tapestry/pom.xml b/dddlib-ioc/dddlib-ioc-tapestry/pom.xml
index 55618bd7b..a7746815b 100644
--- a/dddlib-ioc/dddlib-ioc-tapestry/pom.xml
+++ b/dddlib-ioc/dddlib-ioc-tapestry/pom.xml
@@ -9,9 +9,9 @@
dddlib-ioc-tapestry
jar
DDDLib IoC implemented by Apache Tapestry
-
+
DDDLib IoC的Tapestry实现,通过TapestryInstanceProvider实现InstanceProvider。
-
+
diff --git a/dddlib-ioc/pom.xml b/dddlib-ioc/pom.xml
index 27bf78246..adb08563a 100644
--- a/dddlib-ioc/pom.xml
+++ b/dddlib-ioc/pom.xml
@@ -9,9 +9,9 @@
dddlib-ioc
pom
DDDLib IoC implements
-
+
DDDLib IoC实现。
-
+
diff --git a/dddlib-observer/pom.xml b/dddlib-observer/pom.xml
index 8c0793162..f1f95c71c 100644
--- a/dddlib-observer/pom.xml
+++ b/dddlib-observer/pom.xml
@@ -9,9 +9,9 @@
dddlib-observer
jar
DDDLib Observer
-
+
观察者模式的持久化实现。一个实体类(Observer)可以注册若干主题(Subject),当后者发生改变时可以通知前者。
-
+
diff --git a/dddlib-persistence/dddlib-persistence-hibernate/pom.xml b/dddlib-persistence/dddlib-persistence-hibernate/pom.xml
index 87592e80a..06602dd5f 100644
--- a/dddlib-persistence/dddlib-persistence-hibernate/pom.xml
+++ b/dddlib-persistence/dddlib-persistence-hibernate/pom.xml
@@ -9,9 +9,9 @@
dddlib-persistence-hibernate
jar
DDDLib Persistence API implemented by Hibernate
-
+
DDDLib仓储接口EntityRepository的Hibernate实现。
-
+
diff --git a/dddlib-persistence/dddlib-persistence-jpa/pom.xml b/dddlib-persistence/dddlib-persistence-jpa/pom.xml
index f2cbf7122..fe6223762 100644
--- a/dddlib-persistence/dddlib-persistence-jpa/pom.xml
+++ b/dddlib-persistence/dddlib-persistence-jpa/pom.xml
@@ -10,9 +10,9 @@
dddlib-persistence-jpa
jar
DDDLib Persistence API implemented by JPA
-
+
DDDLib仓储接口EntityRepository的JPA实现。
-
+
diff --git a/dddlib-persistence/dddlib-persistence-test/src/main/resources/sample-data.xml b/dddlib-persistence/dddlib-persistence-test/src/main/resources/sample-data.xml
index 5b137b6f1..65388b8d6 100644
--- a/dddlib-persistence/dddlib-persistence-test/src/main/resources/sample-data.xml
+++ b/dddlib-persistence/dddlib-persistence-test/src/main/resources/sample-data.xml
@@ -64,7 +64,7 @@
id
version
code
- description
+ remark
disabled
parent_code
sort_order
diff --git a/dddlib-persistence/pom.xml b/dddlib-persistence/pom.xml
index 88f7146cf..c7b94bf28 100644
--- a/dddlib-persistence/pom.xml
+++ b/dddlib-persistence/pom.xml
@@ -9,9 +9,9 @@
dddlib-persistence
pom
DDDLib Persistence API implementes
-
+
DDDLib仓储接口实现。
-
+
diff --git a/dddlib-query-channel/pom.xml b/dddlib-query-channel/pom.xml
index 07255f490..bda53b1c5 100644
--- a/dddlib-query-channel/pom.xml
+++ b/dddlib-query-channel/pom.xml
@@ -8,9 +8,9 @@
dddlib-query-channel
jar
DDDLib Query Channel
-
+
查询通道。针对大数据量的查询返回结果,提供分页功能。
-
+
diff --git a/dddlib-rule-engine/pom.xml b/dddlib-rule-engine/pom.xml
index 234a61e8f..d67ef1483 100644
--- a/dddlib-rule-engine/pom.xml
+++ b/dddlib-rule-engine/pom.xml
@@ -8,9 +8,9 @@
dddlib-rule-engine
jar
DDDLib Rule Engine
-
+
规则引擎的封装。提供有状态和无状态的规则服务接口和它们的JSR94实现。
-
+
diff --git a/dddlib-script-engine/pom.xml b/dddlib-script-engine/pom.xml
index 633cb8b6d..07dd90615 100644
--- a/dddlib-script-engine/pom.xml
+++ b/dddlib-script-engine/pom.xml
@@ -9,9 +9,9 @@
dddlib-script-engine
jar
DDDLib Script Language API
-
+
脚本引擎的简单封装。
-
+
diff --git a/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/PermissionInfo.java b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/PermissionInfo.java
new file mode 100644
index 000000000..38c1969b5
--- /dev/null
+++ b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/PermissionInfo.java
@@ -0,0 +1,96 @@
+package org.dayatang.security.api;
+
+import java.util.Date;
+
+/**
+ * Created by yyang on 2016/11/29.
+ */
+public class PermissionInfo {
+ private String id;
+ private int version;
+
+ private String name;
+ private String remark;
+
+ private Date created;
+ private Date lastModified;
+ private boolean disabled;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public int getVersion() {
+ return version;
+ }
+
+ public void setVersion(int version) {
+ this.version = version;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+ public Date getLastModified() {
+ return lastModified;
+ }
+
+ public void setLastModified(Date lastModified) {
+ this.lastModified = lastModified;
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof PermissionInfo)) return false;
+
+ PermissionInfo that = (PermissionInfo) o;
+
+ return getName().equals(that.getName());
+ }
+
+ @Override
+ public int hashCode() {
+ return getName().hashCode();
+ }
+
+ @Override
+ public String toString() {
+ return "PermissionInfo{" +
+ "name='" + name + '\'' +
+ '}';
+ }
+}
diff --git a/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/RoleInfo.java b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/RoleInfo.java
new file mode 100644
index 000000000..d0e19d286
--- /dev/null
+++ b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/RoleInfo.java
@@ -0,0 +1,100 @@
+package org.dayatang.security.api;
+
+import java.util.Date;
+
+/**
+ * Created by yyang on 2016/11/29.
+ */
+public class RoleInfo {
+ private String id;
+ private int version;
+
+ private String name;
+ private String remark;
+
+ private Date created;
+ private Date lastModified;
+ private boolean disabled;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public int getVersion() {
+ return version;
+ }
+
+ public void setVersion(int version) {
+ this.version = version;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+ public Date getLastModified() {
+ return lastModified;
+ }
+
+ public void setLastModified(Date lastModified) {
+ this.lastModified = lastModified;
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof RoleInfo)) {
+ return false;
+ }
+
+ RoleInfo roleInfo = (RoleInfo) o;
+
+ return getName().equals(roleInfo.getName());
+ }
+
+ @Override
+ public int hashCode() {
+ return getName().hashCode();
+ }
+
+ @Override
+ public String toString() {
+ return "RoleInfo{" +
+ "name='" + name + '\'' +
+ '}';
+ }
+}
diff --git a/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/SecurityMgmtService.java b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/SecurityMgmtService.java
index bb8353fd4..a7ac249c6 100644
--- a/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/SecurityMgmtService.java
+++ b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/SecurityMgmtService.java
@@ -1,10 +1,44 @@
package org.dayatang.security.api;
+import java.util.Collection;
+
/**
* Created by yyang on 2016/10/31.
*/
public interface SecurityMgmtService {
+ UserGroupInfo createUserGroup(String name);
+ UserGroupInfo createUserGroup(String name, String remark);
+ UserGroupInfo createChildUserGroup(String parentGroup, String name);
+ UserGroupInfo createChildUserGroup(String parentGroup, String name, String remark);
+ void changeNameOfUserGroup(String originalName, String newName);
+ void changeRemarkOfUserGroup(String groupName, String remark);
+ void disableUserGroup(String groupName);
+
UserInfo createUser(String username, String password);
UserInfo createUser(String username, String password, String remark);
- void changeUsername(String originalName, String newName);
+ void changeNameOfUser(String originalName, String newName);
+ void changePasswordOfUser(String username, String newPassword);
+ void changeRemarkOfUser(String username, String remark);
+ void lockUser(String username);
+ void unlockUser(String username);
+ void disableUser(String username);
+
+ RoleInfo createRole(String name);
+ RoleInfo createRole(String name, String remark);
+ void changeNameOfRole(String originalName, String newName);
+
void changeRemarkOfRole(String roleName, String remark);
+ void disableRole(String roleName);
+
+ PermissionInfo createPermission(String name);
+ PermissionInfo createPermission(String name, String remark);
+ void changeNameOfPermission(String originalName, String newName);
+ void changeRemarkOfPermission(String permissionName, String remark);
+ void disablePermission(String permissionName);
+
+ void addUsersToGroup(String groupName, String... usernames);
+ void addUsersToGroup(String groupName, Collection usernames);
+ void removeUsersFromGroup(String groupName, String... usernames);
+ void removeUsersFromGroup(String groupName, Collection usernames);
+
+
}
diff --git a/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/UserGroupInfo.java b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/UserGroupInfo.java
new file mode 100644
index 000000000..800b92bb3
--- /dev/null
+++ b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/UserGroupInfo.java
@@ -0,0 +1,100 @@
+package org.dayatang.security.api;
+
+import java.util.Date;
+
+/**
+ * Created by yyang on 2016/11/29.
+ */
+public class UserGroupInfo {
+ private String id;
+ private int version;
+
+ private String name;
+ private String remark;
+
+ private Date created;
+ private Date lastModified;
+ private boolean disabled;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public int getVersion() {
+ return version;
+ }
+
+ public void setVersion(int version) {
+ this.version = version;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+ public Date getLastModified() {
+ return lastModified;
+ }
+
+ public void setLastModified(Date lastModified) {
+ this.lastModified = lastModified;
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof UserGroupInfo)) {
+ return false;
+ }
+
+ UserGroupInfo that = (UserGroupInfo) o;
+
+ return getName().equals(that.getName());
+ }
+
+ @Override
+ public int hashCode() {
+ return getName().hashCode();
+ }
+
+ @Override
+ public String toString() {
+ return "UserGroupInfo{" +
+ "name='" + name + '\'' +
+ '}';
+ }
+}
diff --git a/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/UserInfo.java b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/UserInfo.java
index 7d31672b1..57517ae6a 100644
--- a/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/UserInfo.java
+++ b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/UserInfo.java
@@ -15,7 +15,104 @@ public class UserInfo {
private Date created;
private Date lastModified;
private Date expired;
- private boolean disabled;
private boolean locked;
+ private boolean disabled;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public int getVersion() {
+ return version;
+ }
+
+ public void setVersion(int version) {
+ this.version = version;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+ public Date getLastModified() {
+ return lastModified;
+ }
+
+ public void setLastModified(Date lastModified) {
+ this.lastModified = lastModified;
+ }
+
+ public Date getExpired() {
+ return expired;
+ }
+
+ public void setExpired(Date expired) {
+ this.expired = expired;
+ }
+
+ public boolean isLocked() {
+ return locked;
+ }
+
+ public void setLocked(boolean locked) {
+ this.locked = locked;
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof UserInfo)) {
+ return false;
+ }
+
+ UserInfo userInfo = (UserInfo) o;
+
+ return getUsername().equals(userInfo.getUsername());
+ }
+
+ @Override
+ public int hashCode() {
+ return getUsername().hashCode();
+ }
+ @Override
+ public String toString() {
+ return "UserInfo{" +
+ "username='" + username + '\'' +
+ '}';
+ }
}
diff --git a/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/query/LoginCommand.java b/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/query/LoginCommand.java
deleted file mode 100644
index ebe192a62..000000000
--- a/dddlib-security/dddlib-security-api/src/main/java/org/dayatang/security/api/query/LoginCommand.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.dayatang.security.api.query;
-
-/**
- * Created by yyang on 2016/11/29.
- */
-public class LoginCommand {
- private String username;
- private String password;
-
- public LoginCommand(String username, String password) {
- this.username = username;
- this.password = password;
- }
-
- public String getUsername() {
- return username;
- }
-
- public String getPassword() {
- return password;
- }
-}
diff --git a/dddlib-security/dddlib-security-domain/src/main/java/org/dayatang/security/domain/Authority.java b/dddlib-security/dddlib-security-domain/src/main/java/org/dayatang/security/domain/Authority.java
index a8c50ccec..83fa741b5 100644
--- a/dddlib-security/dddlib-security-domain/src/main/java/org/dayatang/security/domain/Authority.java
+++ b/dddlib-security/dddlib-security-domain/src/main/java/org/dayatang/security/domain/Authority.java
@@ -17,7 +17,7 @@ public class Authority extends AbstractEntity {
private String name;
- private String description;
+ private String remark;
protected Authority() {
}
@@ -34,12 +34,12 @@ public void setName(String name) {
this.name = name;
}
- public String getDescription() {
- return description;
+ public String getRemark() {
+ return remark;
}
- public void setDescription(String description) {
- this.description = description;
+ public void setRemark(String remark) {
+ this.remark = remark;
}
@Override
diff --git a/dddlib-spring-test/pom.xml b/dddlib-spring-test/pom.xml
index 2527430c5..bd7e16bf2 100644
--- a/dddlib-spring-test/pom.xml
+++ b/dddlib-spring-test/pom.xml
@@ -9,9 +9,9 @@
dddlib-spring-test
jar
DDDLib Test classes for spring
-
+
数据库集成测试基类,通过Spring实现。
-
+
diff --git a/dddlib-utils/pom.xml b/dddlib-utils/pom.xml
index 8afe79612..8af0928f9 100644
--- a/dddlib-utils/pom.xml
+++ b/dddlib-utils/pom.xml
@@ -9,9 +9,9 @@
dddlib-utils
jar
DDDLib Utils
- DDDLib工具类库,其中最重要的工具是断
+ DDDLib工具类库,其中最重要的工具是断
言Assert和日志Slf4jLogger
-
+
diff --git a/pom.xml b/pom.xml
index b211ec85e..fb0d00a72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,10 +8,10 @@
pom
DDDLib Project
http://dddlib.dayatang.org/
-
+
DDDLib是一个领域驱动设计(Domain Driven Design,简称DDD)类库,为DDD开发范式提供基本的接口、基类和实现,
另外还提供了一些例如断言、配置、Excel读写等基本工具。
-
+