ibiz4j 发布系统代码

app_web/src/components/app-form-druipart/app-form-druipart.vue

@@ -240,7 +240,7 @@ export default class AppFormDRUIPart extends Vue {
         }
         const formData: any = data?data:JSON.parse(this.data);
         const _paramitem = formData[this.paramItem];
-        let viewdata = {srfparentdename:this.parentName,srfparentkey:_paramitem};
+        let viewdata = {};
         Object.assign(viewdata, this.$viewTool.getIndexViewParam());
         const _parameters: any[] = [...this.$viewTool.getIndexParameters(), ...this.parameters];
         _parameters.forEach((parameter: any) => {
@@ -252,6 +252,7 @@ export default class AppFormDRUIPart extends Vue {
         Object.assign(viewdata, { [this.paramItem]: _paramitem });
         //设置顶层视图唯一标识
         Object.assign(viewdata,this.context);
+        Object.assign(viewdata,{srfparentdename:this.parentName,srfparentkey:_paramitem});
         this.viewdata = JSON.stringify(viewdata);
         this.viewparam = JSON.stringify(this.viewparams);
         if (this.isRelationalData) {

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
-      mvn clean package -Pweb
-      cd ibzuaa-app/ibzuaa-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
 
-EXPOSE 30002
+EXPOSE 8080
 
 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar

ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml

@@ -3,23 +3,9 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "30002:30002"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30002
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - ABC=1
-      - DEC=2
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysAuthLog.java

@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import java.io.Serializable;
-import lombok.Data;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[认证日志]
  */
-@Data
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName(value = "IBZAUTHLOG",resultMap = "SysAuthLogResultMap")
 public class SysAuthLog extends EntityMP implements Serializable {
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java

@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import java.io.Serializable;
-import lombok.Data;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[权限/资源]
  */
-@Data
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName(value = "IBZPERMISSION",resultMap = "SysPermissionResultMap")
 public class SysPermission extends EntityMP implements Serializable {
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java

@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import java.io.Serializable;
-import lombok.Data;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[系统角色]
  */
-@Data
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName(value = "IBZROLE",resultMap = "SysRoleResultMap")
 public class SysRole extends EntityMP implements Serializable {
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRolePermission.java

@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import java.io.Serializable;
-import lombok.Data;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[角色权限关系]
  */
-@Data
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName(value = "IBZROLE_PERMISSION",resultMap = "SysRolePermissionResultMap")
 public class SysRolePermission extends EntityMP implements Serializable {
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUser.java

@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import java.io.Serializable;
-import lombok.Data;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[系统用户]
  */
-@Data
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName(value = "IBZUSER",resultMap = "SysUserResultMap")
 public class SysUser extends EntityMP implements Serializable {
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserRole.java

@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import java.io.Serializable;
-import lombok.Data;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[用户角色关系]
  */
-@Data
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName(value = "IBZUSER_ROLE",resultMap = "SysUserRoleResultMap")
 public class SysUserRole extends EntityMP implements Serializable {
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysAuthLogSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
@@ -24,7 +24,10 @@ import cn.ibizlab.core.uaa.domain.SysAuthLog;
  * 关系型数据实体[SysAuthLog] 查询条件对象
  */
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> {
 
 	private String n_username_like;//[用户全局名]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysPSSystemSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
@@ -24,7 +24,10 @@ import cn.ibizlab.core.uaa.domain.SysPSSystem;
  * 关系型数据实体[SysPSSystem] 查询条件对象
  */
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysPSSystemSearchContext extends QueryWrapperContext<SysPSSystem> {
 
 	private String n_pssystemname_like;//[系统名称]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysPermissionSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
@@ -24,7 +24,10 @@ import cn.ibizlab.core.uaa.domain.SysPermission;
  * 关系型数据实体[SysPermission] 查询条件对象
  */
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysPermissionSearchContext extends QueryWrapperContext<SysPermission> {
 
 	private String n_sys_permissionid_like;//[资源标识]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRolePermissionSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
@@ -24,7 +24,10 @@ import cn.ibizlab.core.uaa.domain.SysRolePermission;
  * 关系型数据实体[SysRolePermission] 查询条件对象
  */
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysRolePermissionSearchContext extends QueryWrapperContext<SysRolePermission> {
 
 	private String n_sys_roleid_eq;//[角色表标识]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRoleSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
@@ -24,7 +24,10 @@ import cn.ibizlab.core.uaa.domain.SysRole;
  * 关系型数据实体[SysRole] 查询条件对象
  */
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
 
 	private String n_sys_rolename_isnotnull;//[角色表名称]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserRoleSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
@@ -24,7 +24,10 @@ import cn.ibizlab.core.uaa.domain.SysUserRole;
  * 关系型数据实体[SysUserRole] 查询条件对象
  */
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysUserRoleSearchContext extends QueryWrapperContext<SysUserRole> {
 
 	private String n_sys_roleid_eq;//[角色表标识]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
@@ -24,7 +24,10 @@ import cn.ibizlab.core.uaa.domain.SysUser;
  * 关系型数据实体[SysUser] 查询条件对象
  */
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysUserSearchContext extends QueryWrapperContext<SysUser> {
 
 	private String n_username_like;//[用户全局名]

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/QueryBuildContext.java

@@ -3,11 +3,14 @@ package cn.ibizlab.util.filter;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.mongodb.QueryBuilder;
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class QueryBuildContext extends SearchContextBase implements ISearchContext{
 
     @JsonIgnore

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/QueryWrapperContext.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.ObjectUtils;
@@ -17,7 +17,10 @@ import java.util.Iterator;
 import java.util.List;
 
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class QueryWrapperContext<T> extends SearchContextBase implements ISearchContext{
 
     @JsonIgnore

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -4,7 +4,7 @@ import cn.ibizlab.util.security.AuthenticationUser;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -17,7 +17,10 @@ import java.util.List;
 import java.util.Map;
 
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class SearchContextBase implements ISearchContext{
 
     /**