ibizdev提交

config.xml

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

ibzwf-boot/src/main/resources/application-dev.yml

 server:
-  port: 8080
+  port: 40003
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFGroupServiceImpl.java

@@ -48,7 +48,6 @@ public class WFGroupServiceImpl extends ServiceImpl<WFGroupMapper, WFGroup> impl
     @Lazy
     private cn.ibizlab.core.workflow.service.IWFMemberService wfmemberService;
 
-
     private int batchSize = 500;
 
     @Override
@@ -120,8 +119,8 @@ public class WFGroupServiceImpl extends ServiceImpl<WFGroupMapper, WFGroup> impl
     @Transactional
     public boolean remove(String key) {
         wfmemberService.removeByGroupid(key) ;
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFMemberServiceImpl.java

@@ -44,7 +44,6 @@ import org.springframework.util.StringUtils;
 @Service("WFMemberServiceImpl")
 public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> implements IWFMemberService {
 
-
     @Autowired
     @Lazy
     private cn.ibizlab.core.workflow.service.IWFGroupService wfgroupService;
@@ -61,6 +60,7 @@ public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> i
 
     @Override
     public WFMember getDraft(WFMember et) {
+        fillParentData(et);
         return et;
     }
 
@@ -76,14 +76,15 @@ public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> i
 
     @Override
     public void createBatch(List<WFMember> list) {
+        list.forEach(item->fillParentData(item));
         saveBatch(list,batchSize);
     }
 
     @Override
     @Transactional
     public boolean remove(String key) {
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override
@@ -113,6 +114,7 @@ public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> i
 
     @Override
     public void saveBatch(List<WFMember> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
@@ -128,6 +130,7 @@ public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> i
 
     @Override
     public void updateBatch(List<WFMember> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFProcessDefinitionServiceImpl.java

@@ -45,7 +45,6 @@ import org.springframework.util.StringUtils;
 public class WFProcessDefinitionServiceImpl extends ServiceImpl<WFProcessDefinitionMapper, WFProcessDefinition> implements IWFProcessDefinitionService {
 
 
-
     private int batchSize = 500;
 
     @Override
@@ -127,8 +126,8 @@ public class WFProcessDefinitionServiceImpl extends ServiceImpl<WFProcessDefinit
     @Override
     @Transactional
     public boolean remove(String key) {
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFProcessInstanceServiceImpl.java

@@ -30,7 +30,6 @@ import cn.ibizlab.core.workflow.service.IWFProcessInstanceService;
 import cn.ibizlab.util.helper.CachedBeanCopier;
 
 
-
 /**
  * 实体[流程实例] 无存储服务对象接口实现
  */
@@ -39,9 +38,9 @@ import cn.ibizlab.util.helper.CachedBeanCopier;
 public class WFProcessInstanceServiceImpl implements IWFProcessInstanceService {
 
 
-
     @Override
     public boolean update(WFProcessInstance et) {
+        //代码实现
         return true;
     }
 
@@ -52,6 +51,7 @@ public class WFProcessInstanceServiceImpl implements IWFProcessInstanceService {
     @Override
     @Transactional
     public boolean save(WFProcessInstance et) {
+        //代码实现
         return true;
     }
 
@@ -62,11 +62,11 @@ public class WFProcessInstanceServiceImpl implements IWFProcessInstanceService {
 
     @Override
     public WFProcessInstance getDraft(WFProcessInstance et) {
-        return null;
+        return et;
     }
 
     @Override
-    public boolean remove(String id) {
+    public boolean remove(String key) {
         return true;
     }
 
@@ -75,8 +75,10 @@ public class WFProcessInstanceServiceImpl implements IWFProcessInstanceService {
     }
 
     @Override
-    public WFProcessInstance get(String id) {
-        return null;
+    public WFProcessInstance get(String key) {
+        WFProcessInstance et = new WFProcessInstance();
+        et.setId(id);
+        return et;
     }
 
     @Override
@@ -85,6 +87,7 @@ public class WFProcessInstanceServiceImpl implements IWFProcessInstanceService {
     }
     @Override
     public boolean create(WFProcessInstance et) {
+        //代码实现
         return true;
     }
 
@@ -101,7 +104,7 @@ public class WFProcessInstanceServiceImpl implements IWFProcessInstanceService {
      */
     @Override
     public Page<WFProcessInstance> searchDefault(WFProcessInstanceSearchContext context) {
-        return null;
+        return new PageImpl<WFProcessInstance>(new ArrayList(),context.getPageable(),0);
     }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFProcessNodeServiceImpl.java

@@ -30,7 +30,6 @@ import cn.ibizlab.core.workflow.service.IWFProcessNodeService;
 import cn.ibizlab.util.helper.CachedBeanCopier;
 
 
-
 /**
  * 实体[流程定义节点] 无存储服务对象接口实现
  */
@@ -39,9 +38,8 @@ import cn.ibizlab.util.helper.CachedBeanCopier;
 public class WFProcessNodeServiceImpl implements IWFProcessNodeService {
 
 
-
     @Override
-    public boolean remove(String usertaskid) {
+    public boolean remove(String key) {
         return true;
     }
 
@@ -56,6 +54,7 @@ public class WFProcessNodeServiceImpl implements IWFProcessNodeService {
     @Override
     @Transactional
     public boolean save(WFProcessNode et) {
+        //代码实现
         return true;
     }
 
@@ -65,12 +64,15 @@ public class WFProcessNodeServiceImpl implements IWFProcessNodeService {
     }
 
     @Override
-    public WFProcessNode get(String usertaskid) {
-        return null;
+    public WFProcessNode get(String key) {
+        WFProcessNode et = new WFProcessNode();
+        et.setUsertaskid(usertaskid);
+        return et;
     }
 
     @Override
     public boolean create(WFProcessNode et) {
+        //代码实现
         return true;
     }
 
@@ -80,6 +82,7 @@ public class WFProcessNodeServiceImpl implements IWFProcessNodeService {
 
     @Override
     public boolean update(WFProcessNode et) {
+        //代码实现
         return true;
     }
 
@@ -89,7 +92,7 @@ public class WFProcessNodeServiceImpl implements IWFProcessNodeService {
 
     @Override
     public WFProcessNode getDraft(WFProcessNode et) {
-        return null;
+        return et;
     }
 
 
@@ -101,7 +104,7 @@ public class WFProcessNodeServiceImpl implements IWFProcessNodeService {
      */
     @Override
     public Page<WFProcessNode> searchDefault(WFProcessNodeSearchContext context) {
-        return null;
+        return new PageImpl<WFProcessNode>(new ArrayList(),context.getPageable(),0);
     }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFSystemServiceImpl.java

@@ -45,14 +45,13 @@ import org.springframework.util.StringUtils;
 public class WFSystemServiceImpl extends ServiceImpl<WFSystemMapper, WFSystem> implements IWFSystemService {
 
 
-
     private int batchSize = 500;
 
     @Override
     @Transactional
     public boolean remove(String key) {
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFTaskServiceImpl.java

@@ -30,7 +30,6 @@ import cn.ibizlab.core.workflow.service.IWFTaskService;
 import cn.ibizlab.util.helper.CachedBeanCopier;
 
 
-
 /**
  * 实体[工作流任务] 无存储服务对象接口实现
  */
@@ -39,9 +38,9 @@ import cn.ibizlab.util.helper.CachedBeanCopier;
 public class WFTaskServiceImpl implements IWFTaskService {
 
 
-
     @Override
     public boolean create(WFTask et) {
+        //代码实现
         return true;
     }
 
@@ -51,11 +50,11 @@ public class WFTaskServiceImpl implements IWFTaskService {
 
     @Override
     public WFTask getDraft(WFTask et) {
-        return null;
+        return et;
     }
 
     @Override
-    public boolean remove(String id) {
+    public boolean remove(String key) {
         return true;
     }
 
@@ -69,6 +68,7 @@ public class WFTaskServiceImpl implements IWFTaskService {
     }
     @Override
     public boolean update(WFTask et) {
+        //代码实现
         return true;
     }
 
@@ -77,13 +77,16 @@ public class WFTaskServiceImpl implements IWFTaskService {
     }
 
     @Override
-    public WFTask get(String id) {
-        return null;
+    public WFTask get(String key) {
+        WFTask et = new WFTask();
+        et.setId(id);
+        return et;
     }
 
     @Override
     @Transactional
     public boolean save(WFTask et) {
+        //代码实现
         return true;
     }
 
@@ -101,7 +104,7 @@ public class WFTaskServiceImpl implements IWFTaskService {
      */
     @Override
     public Page<WFTask> searchDefault(WFTaskSearchContext context) {
-        return null;
+        return new PageImpl<WFTask>(new ArrayList(),context.getPageable(),0);
     }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFTaskWayServiceImpl.java

@@ -30,7 +30,6 @@ import cn.ibizlab.core.workflow.service.IWFTaskWayService;
 import cn.ibizlab.util.helper.CachedBeanCopier;
 
 
-
 /**
  * 实体[操作路径] 无存储服务对象接口实现
  */
@@ -39,13 +38,13 @@ import cn.ibizlab.util.helper.CachedBeanCopier;
 public class WFTaskWayServiceImpl implements IWFTaskWayService {
 
 
-
     @Override
     public boolean checkKey(WFTaskWay et) {
         return false;
     }
     @Override
     public boolean create(WFTaskWay et) {
+        //代码实现
         return true;
     }
 
@@ -55,16 +54,18 @@ public class WFTaskWayServiceImpl implements IWFTaskWayService {
 
     @Override
     public WFTaskWay getDraft(WFTaskWay et) {
-        return null;
+        return et;
     }
 
     @Override
-    public WFTaskWay get(String sequenceflowid) {
-        return null;
+    public WFTaskWay get(String key) {
+        WFTaskWay et = new WFTaskWay();
+        et.setSequenceflowid(sequenceflowid);
+        return et;
     }
 
     @Override
-    public boolean remove(String sequenceflowid) {
+    public boolean remove(String key) {
         return true;
     }
 
@@ -74,6 +75,7 @@ public class WFTaskWayServiceImpl implements IWFTaskWayService {
 
     @Override
     public boolean update(WFTaskWay et) {
+        //代码实现
         return true;
     }
 
@@ -84,6 +86,7 @@ public class WFTaskWayServiceImpl implements IWFTaskWayService {
     @Override
     @Transactional
     public boolean save(WFTaskWay et) {
+        //代码实现
         return true;
     }
 
@@ -101,7 +104,7 @@ public class WFTaskWayServiceImpl implements IWFTaskWayService {
      */
     @Override
     public Page<WFTaskWay> searchDefault(WFTaskWaySearchContext context) {
-        return null;
+        return new PageImpl<WFTaskWay>(new ArrayList(),context.getPageable(),0);
     }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFUserServiceImpl.java

@@ -48,14 +48,13 @@ public class WFUserServiceImpl extends ServiceImpl<WFUserMapper, WFUser> impleme
     @Lazy
     private cn.ibizlab.core.workflow.service.IWFMemberService wfmemberService;
 
-
     private int batchSize = 500;
 
     @Override
     @Transactional
     public boolean remove(String key) {
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzwf-provider/ibzwf-provider-api/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 /ibzwf-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40003
 
 ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar

ibzwf-provider/ibzwf-provider-api/src/main/docker/ibzwf-provider-api.yaml

@@ -3,9 +3,11 @@ services:
   ibzwf-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40003:40003"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzwf-provider/ibzwf-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 8081
\ No newline at end of file
+  port: 40003
\ No newline at end of file

ibzwf-provider/ibzwf-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 8081
+  port: 40003