diff --git a/pom.xml b/pom.xml
index 452b4565e..ca9db635b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
cn.wizzer
nutzwk
war
- 3.3.1
+ 3.3.2
NutzWk
http://www.wizzer.cn
@@ -60,22 +60,22 @@
org.nutz
nutz
- 1.r.58
+ 1.r.59
org.nutz
nutz-plugins-daocache
- 1.r.58
+ 1.r.59
org.nutz
nutz-integration-quartz
- 1.r.58
+ 1.r.59
org.nutz
nutz-integration-shiro
- 1.r.58
+ 1.r.59
org.nutz
@@ -85,7 +85,7 @@
org.nutz
nutz-plugins-views
- 1.r.58
+ 1.r.59
org.nutz
@@ -332,7 +332,7 @@
org.nutz
nutz-plugins-mock
- 1.r.58
+ 1.r.59
test
diff --git a/src/main/java/cn/wizzer/modules/models/cms/Cms_article.java b/src/main/java/cn/wizzer/modules/models/cms/Cms_article.java
index 7cf74ee74..4f25f70fb 100644
--- a/src/main/java/cn/wizzer/modules/models/cms/Cms_article.java
+++ b/src/main/java/cn/wizzer/modules/models/cms/Cms_article.java
@@ -71,7 +71,7 @@ public class Cms_article extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 32)
private String channelId;
- @One(target = Cms_channel.class, field = "channelId")
+ @One(field = "channelId")
private Cms_channel channel;
public String getId() {
diff --git a/src/main/java/cn/wizzer/modules/models/cms/Cms_link.java b/src/main/java/cn/wizzer/modules/models/cms/Cms_link.java
index 688cae63e..105232634 100644
--- a/src/main/java/cn/wizzer/modules/models/cms/Cms_link.java
+++ b/src/main/java/cn/wizzer/modules/models/cms/Cms_link.java
@@ -47,7 +47,7 @@ public class Cms_link extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 32)
private String classId;
- @One(target = Cms_link_class.class, field = "classId")
+ @One(field = "classId")
private Cms_link_class linkClass;
public String getId() {
diff --git a/src/main/java/cn/wizzer/modules/models/cms/Cms_link_class.java b/src/main/java/cn/wizzer/modules/models/cms/Cms_link_class.java
index 2b3f3087f..6baa97f82 100644
--- a/src/main/java/cn/wizzer/modules/models/cms/Cms_link_class.java
+++ b/src/main/java/cn/wizzer/modules/models/cms/Cms_link_class.java
@@ -24,7 +24,7 @@ public class Cms_link_class extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 120)
private String name;
- @ManyMany(from = "classId", relation = "cms_class_link", target = Cms_link.class, to = "linkId")
+ @ManyMany(from = "classId", relation = "cms_class_link", to = "linkId")
private List links;
public String getId() {
diff --git a/src/main/java/cn/wizzer/modules/models/sys/Sys_role.java b/src/main/java/cn/wizzer/modules/models/sys/Sys_role.java
index fd197920a..2aff9593f 100644
--- a/src/main/java/cn/wizzer/modules/models/sys/Sys_role.java
+++ b/src/main/java/cn/wizzer/modules/models/sys/Sys_role.java
@@ -43,13 +43,13 @@ public class Sys_role extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 255)
private String note;
- @One(target = Sys_unit.class, field = "unitid")
+ @One(field = "unitid")
public Sys_unit unit;
- @ManyMany(from = "roleId", relation = "sys_role_menu", target = Sys_menu.class, to = "menuId")
+ @ManyMany(from = "roleId", relation = "sys_role_menu", to = "menuId")
protected List menus;
- @ManyMany(from = "roleId", relation = "sys_user_role", target = Sys_user.class, to = "userId")
+ @ManyMany(from = "roleId", relation = "sys_user_role", to = "userId")
private List users;
public String getId() {
diff --git a/src/main/java/cn/wizzer/modules/models/sys/Sys_user.java b/src/main/java/cn/wizzer/modules/models/sys/Sys_user.java
index 94001d26c..341543fd4 100644
--- a/src/main/java/cn/wizzer/modules/models/sys/Sys_user.java
+++ b/src/main/java/cn/wizzer/modules/models/sys/Sys_user.java
@@ -96,13 +96,13 @@ public class Sys_user extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 32)
private String unitid;
- @One(target = Sys_unit.class, field = "unitid")
+ @One(field = "unitid")
private Sys_unit unit;
- @ManyMany(from = "userId", relation = "sys_user_role", target = Sys_role.class, to = "roleId")
+ @ManyMany(from = "userId", relation = "sys_user_role", to = "roleId")
private List roles;
- @ManyMany(from = "userId", relation = "sys_user_unit", target = Sys_unit.class, to = "unitId")
+ @ManyMany(from = "userId", relation = "sys_user_unit", to = "unitId")
protected List units;
protected List menus;
diff --git a/src/main/java/cn/wizzer/modules/models/wx/Wx_mass.java b/src/main/java/cn/wizzer/modules/models/wx/Wx_mass.java
index 0b71d32bf..133204cf5 100644
--- a/src/main/java/cn/wizzer/modules/models/wx/Wx_mass.java
+++ b/src/main/java/cn/wizzer/modules/models/wx/Wx_mass.java
@@ -53,7 +53,7 @@ public class Wx_mass extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 32)
private String wxid;
- @One(target = Wx_config.class, field = "wxid")
+ @One(field = "wxid")
private Wx_config wxConfig;
public String getId() {
diff --git a/src/main/java/cn/wizzer/modules/models/wx/Wx_mass_news.java b/src/main/java/cn/wizzer/modules/models/wx/Wx_mass_news.java
index aa1935a55..03019df97 100644
--- a/src/main/java/cn/wizzer/modules/models/wx/Wx_mass_news.java
+++ b/src/main/java/cn/wizzer/modules/models/wx/Wx_mass_news.java
@@ -67,7 +67,7 @@ public class Wx_mass_news extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 32)
private String wxid;
- @One(target = Wx_config.class, field = "wxid")
+ @One(field = "wxid")
private Wx_config wxConfig;
public String getId() {
diff --git a/src/main/java/cn/wizzer/modules/models/wx/Wx_mass_send.java b/src/main/java/cn/wizzer/modules/models/wx/Wx_mass_send.java
index 3acd3cde2..fc371c857 100644
--- a/src/main/java/cn/wizzer/modules/models/wx/Wx_mass_send.java
+++ b/src/main/java/cn/wizzer/modules/models/wx/Wx_mass_send.java
@@ -53,7 +53,7 @@ public class Wx_mass_send extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 32)
private String wxid;
- @One(target = Wx_config.class, field = "wxid")
+ @One(field = "wxid")
private Wx_config wxConfig;
public String getId() {
diff --git a/src/main/java/cn/wizzer/modules/models/wx/Wx_menu.java b/src/main/java/cn/wizzer/modules/models/wx/Wx_menu.java
index c2c2a9940..de90d16b4 100644
--- a/src/main/java/cn/wizzer/modules/models/wx/Wx_menu.java
+++ b/src/main/java/cn/wizzer/modules/models/wx/Wx_menu.java
@@ -66,7 +66,7 @@ public class Wx_menu extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 32)
private String wxid;
- @One(target = Wx_config.class, field = "wxid")
+ @One(field = "wxid")
private Wx_config wxConfig;
public String getId() {
diff --git a/src/main/java/cn/wizzer/modules/models/wx/Wx_msg.java b/src/main/java/cn/wizzer/modules/models/wx/Wx_msg.java
index ee74deb89..87b7e8a45 100644
--- a/src/main/java/cn/wizzer/modules/models/wx/Wx_msg.java
+++ b/src/main/java/cn/wizzer/modules/models/wx/Wx_msg.java
@@ -48,10 +48,10 @@ public class Wx_msg extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 32)
private String wxid;
- @One(target = Wx_msg_reply.class, field = "replyId")
+ @One(field = "replyId")
private Wx_msg_reply reply;
- @One(target = Wx_config.class, field = "wxid")
+ @One(field = "wxid")
private Wx_config wxConfig;
public String getId() {
diff --git a/src/main/java/cn/wizzer/modules/models/wx/Wx_reply.java b/src/main/java/cn/wizzer/modules/models/wx/Wx_reply.java
index 2bd0c514e..a70e65cf9 100644
--- a/src/main/java/cn/wizzer/modules/models/wx/Wx_reply.java
+++ b/src/main/java/cn/wizzer/modules/models/wx/Wx_reply.java
@@ -43,7 +43,7 @@ public class Wx_reply extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 32)
private String wxid;
- @One(target = Wx_config.class, field = "wxid")
+ @One(field = "wxid")
private Wx_config wxConfig;
public String getId() {
diff --git a/src/main/java/cn/wizzer/modules/models/wx/Wx_user.java b/src/main/java/cn/wizzer/modules/models/wx/Wx_user.java
index 595299a3f..bb9a483b8 100644
--- a/src/main/java/cn/wizzer/modules/models/wx/Wx_user.java
+++ b/src/main/java/cn/wizzer/modules/models/wx/Wx_user.java
@@ -73,7 +73,7 @@ public class Wx_user extends Model implements Serializable {
@ColDefine(type = ColType.VARCHAR, width = 32)
private String wxid;
- @One(target = Wx_config.class, field = "wxid")
+ @One(field = "wxid")
private Wx_config wxConfig;
public String getId() {