ibiz4j 发布系统代码

config.xml

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

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

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

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

@@ -3,22 +3,9 @@ services:
   ibzrt-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
     ports:
-      - "30000:30000"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30000
-      - 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&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/DictCatalogDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/DictOptionDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/IBZDepartmentDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/IBZDeptMemberDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/IBZEmployeeDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/IBZOrganizationDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/IBZPostDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/IBZTeamDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/IBZTeamMemberDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/JobsInfoDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/JobsLockDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/JobsLogDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/JobsRegistryDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysAppDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysAuthLogDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysPermissionDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysRoleDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysRolePermissionDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysUserDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysUserRoleDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/WFGroupDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/WFMemberDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/WFProcessDefinitionDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/WFREModelDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/WFSystemDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/WFUserDTO.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
 
 /**

ibzrt-util/src/main/java/cn/ibizlab/util/domain/DTOClient.java

+package cn.ibizlab.util.domain;
+
+public class DTOClient extends DTOBase {
+
+    @Override
+    public void modify(String field,Object val) {
+        if(val==null){
+            this.getFocusNull().add(field.toLowerCase());
+            getExtensionparams().put("dirtyflagenable",true);
+            getExtensionparams().put(field.toLowerCase()+"dirtyflag",true);
+        }
+        else{
+            this.getFocusNull().remove(field.toLowerCase());
+            getExtensionparams().remove(field.toLowerCase()+"dirtyflag");
+        }
+    }
+}
+