update: nutz 1.r.59

Wizzercn · Dec 1, 2016 · a1b9a6b · a1b9a6b
1 parent d1f7707
commit a1b9a6b
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>cn.wizzer</groupId>
     <artifactId>nutzwk</artifactId>
     <packaging>war</packaging>
-    <version>3.3.1</version>
+    <version>3.3.2</version>
     <name>NutzWk</name>
     <url>http://www.wizzer.cn</url>
     <properties>
@@ -60,22 +60,22 @@
         <dependency>
             <groupId>org.nutz</groupId>
             <artifactId>nutz</artifactId>
-            <version>1.r.58</version>
+            <version>1.r.59</version>
         </dependency>
         <dependency>
             <groupId>org.nutz</groupId>
             <artifactId>nutz-plugins-daocache</artifactId>
-            <version>1.r.58</version>
+            <version>1.r.59</version>
         </dependency>
         <dependency>
             <groupId>org.nutz</groupId>
             <artifactId>nutz-integration-quartz</artifactId>
-            <version>1.r.58</version>
+            <version>1.r.59</version>
         </dependency>
         <dependency>
             <groupId>org.nutz</groupId>
             <artifactId>nutz-integration-shiro</artifactId>
-            <version>1.r.58</version>
+            <version>1.r.59</version>
         </dependency>
         <dependency>
             <groupId>org.nutz</groupId>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.nutz</groupId>
             <artifactId>nutz-plugins-views</artifactId>
-            <version>1.r.58</version>
+            <version>1.r.59</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.nutz</groupId>
@@ -332,7 +332,7 @@
         <dependency>
             <groupId>org.nutz</groupId>
             <artifactId>nutz-plugins-mock</artifactId>
-            <version>1.r.58</version>
+            <version>1.r.59</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

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
@@ -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
@@ -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
@@ -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<Cms_link> 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
@@ -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<Sys_menu> 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<Sys_user> 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
@@ -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<Sys_role> 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<Sys_unit> units;
 
     protected List<Sys_menu> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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() {