Merge remote-tracking branch 'origin/master'

app_web/src/widgets/meta-entity/main-form/main-form-base.vue

@@ -146,7 +146,7 @@
     :formState="formState"
     :isForbidLoad="this.data.srfuf === '0'"
     paramItem='metaentity' 
-    :parentdata='{"srfparentdefname":"REFENTITYID","srfparentdename":"META_ENTITY","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_META_RELATION_META_ENTITY_REFENTITYID","SRFDER1NID":"DER1N_META_RELATION_META_ENTITY_REFENTITYID"}'
+    :parentdata='{"srfparentdefname":"ENTITYID","srfparentdename":"META_ENTITY","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_META_RELATION_META_ENTITY_ENTITYID","SRFDER1NID":"DER1N_META_RELATION_META_ENTITY_ENTITYID"}'
     :parameters="[
         { pathName: 'metaentities', parameterName: 'metaentity' },
     ]"

ibzlite-core/src/main/resources/liquibase/h2_table.xml

@@ -162,7 +162,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-75-8">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-77-8">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DstAPIDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DstAppDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DstComponentDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DstConfigDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DstDataSourceDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DstLookupDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DstMicroserviceDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DstRouterDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DstViewDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaDataSetDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaEntityDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaFieldDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaModelDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaModuleDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaRelationshipDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzlite-util/src/main/java/cn/ibizlab/util/aspect/DEFieldDefaultValueAspect.java

@@ -194,7 +194,7 @@ public class DEFieldDefaultValueAspect
                         et.set(fieldname,curUser.getUserid());
                         break;
                     case OPERATORNAME:
-                        et.set(fieldname,curUser.getPersonname());
+                        et.set(fieldname,curUser.getUsername());
                         break;
                     case CURTIME:
                         et.set(fieldname,new Timestamp(new Date().getTime()));
@@ -222,13 +222,13 @@ public class DEFieldDefaultValueAspect
                     et.set(fieldname,curUser.getUserid());
                     break;
                 case CREATEMANNAME:
-                    et.set(fieldname,curUser.getPersonname());
+                    et.set(fieldname,curUser.getUsername());
                     break;
                 case UPDATEMAN:
                     et.set(fieldname,curUser.getUserid());
                     break;
                 case UPDATEMANNAME:
-                    et.set(fieldname,curUser.getPersonname());
+                    et.set(fieldname,curUser.getUsername());
                     break;
                 case CREATEDATE:
                     et.set(fieldname,new Timestamp(new Date().getTime()));