ibiz4j 发布系统代码 [ibz-wf，统一工作流]

config.xml

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

ibzwf-app/ibzwf-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 /ibzwf-app-web.jar
 
-EXPOSE 30003
+EXPOSE 8080
 
 ADD ibzwf-app-web.jar /ibzwf-app-web.jar

ibzwf-app/ibzwf-app-web/src/main/docker/ibzwf-app-web-k8s.yaml

@@ -22,34 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 30003
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.180.237"      
-        - name: SERVER_PORT
-          value: "30003"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.100.243:8848"
-        - name: SPRING_REDIS_HOST
-          value: "172.16.100.243"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_A_5d9d78509"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "@6dEfb3@"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_A_5d9d78509"
-        - name: NACOS
-          value: "172.16.100.243:8848"      
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
-          value: "ibizdev"      
+        - containerPort: 8080
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -69,9 +42,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 30003
-    targetPort: 30003
-    nodePort: 30003
+    port: 8080
+    targetPort: 8080
+    nodePort: 8080
     protocol: TCP
   selector:
     app: ibzwf-app-web

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

@@ -3,23 +3,9 @@ services:
   ibzwf-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
     ports:
-      - "30003:30003"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30003
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243: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.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

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

@@ -228,9 +228,6 @@ public class WFGroupServiceImpl extends ServiceImpl<WFGroupMapper, WFGroup> impl
 
 
 
-
-
-
     public IWFGroupService getProxyService() {
         return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
     }

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

@@ -106,7 +106,6 @@ public class WFHistoryServiceImpl implements IWFHistoryService {
         return new PageImpl<WFHistory>(new ArrayList(),context.getPageable(),0);
     }
 
-
 }
 
 

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

@@ -335,9 +335,6 @@ public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> i
     }
 
 
-
-
-
 }
 
 

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

@@ -221,9 +221,6 @@ public class WFProcessDefinitionServiceImpl extends ServiceImpl<WFProcessDefinit
 
 
 
-
-
-
     public IWFProcessDefinitionService getProxyService() {
         return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
     }

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

@@ -106,7 +106,6 @@ public class WFProcessInstanceServiceImpl implements IWFProcessInstanceService {
         return new PageImpl<WFProcessInstance>(new ArrayList(),context.getPageable(),0);
     }
 
-
 }
 
 

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

@@ -106,7 +106,6 @@ public class WFProcessNodeServiceImpl implements IWFProcessNodeService {
         return new PageImpl<WFProcessNode>(new ArrayList(),context.getPageable(),0);
     }
 
-
 }
 
 

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

@@ -221,9 +221,6 @@ public class WFSystemServiceImpl extends ServiceImpl<WFSystemMapper, WFSystem> i
 
 
 
-
-
-
     public IWFSystemService getProxyService() {
         return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
     }

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

@@ -106,7 +106,6 @@ public class WFTaskWayServiceImpl implements IWFTaskWayService {
         return new PageImpl<WFTaskWay>(new ArrayList(),context.getPageable(),0);
     }
 
-
 }
 
 

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

@@ -245,9 +245,6 @@ public class WFUserServiceImpl extends ServiceImpl<WFUserMapper, WFUser> impleme
     }
 
 
-
-
-
     public IWFUserService getProxyService() {
         return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
     }

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[WF_GROUP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group-8-1">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group-9-1">
         <createTable tableName="IBZWFGROUP">
                 <column name="GROUPID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>
@@ -20,7 +20,7 @@
 
 
     <!--输出实体[WF_GROUP_MEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-9-2">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-10-2">
         <createTable tableName="IBZWFMEMBER">
                 <column name="MEMBERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/>
@@ -79,7 +79,7 @@
 
         <!--输出实体[WF_GROUP]外键关系 -->
         <!--输出实体[WF_GROUP_MEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-9-5">
+    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-10-5">
        <addForeignKeyConstraint baseColumnNames="GROUPID" baseTableName="IBZWFMEMBER" constraintName="DER1N_WF_GROUP_MEMBER_WF_GROUP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="GROUPID" referencedTableName="IBZWFGROUP" validate="true"/>
     </changeSet>
         <!--输出实体[WF_DEFINITION]外键关系 -->

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFGroupResource.java

@@ -136,7 +136,6 @@ public class WFGroupResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-searchDefault-all')")
 	@ApiOperation(value = "获取DEFAULT", tags = {"角色/用户组" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfgroups/fetchdefault")
 	public ResponseEntity<List<WFGroupDTO>> fetchDefault(WFGroupSearchContext context) {
@@ -149,7 +148,6 @@ public class WFGroupResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-searchDefault-all')")
 	@ApiOperation(value = "查询DEFAULT", tags = {"角色/用户组" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/wfgroups/searchdefault")
 	public ResponseEntity<Page<WFGroupDTO>> searchDefault(@RequestBody WFGroupSearchContext context) {
@@ -159,5 +157,6 @@ public class WFGroupResource {
 	}
 
 
+
 }
 

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFMemberResource.java

@@ -121,14 +121,12 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto)));
     }
 
-    @PreAuthorize("hasPermission(this.wfmemberMapping.toDomain(#wfmemberdto),'ibzwf-WFMember-Save')")
     @ApiOperation(value = "保存成员", tags = {"成员" },  notes = "保存成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/save")
     public ResponseEntity<Boolean> save(@RequestBody WFMemberDTO wfmemberdto) {
         return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.save(wfmemberMapping.toDomain(wfmemberdto)));
     }
 
-    @PreAuthorize("hasPermission(this.wfmemberMapping.toDomain(#wfmemberdtos),'ibzwf-WFMember-Save')")
     @ApiOperation(value = "批量保存成员", tags = {"成员" },  notes = "批量保存成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) {
@@ -159,6 +157,7 @@ public class WFMemberResource {
 	}
 
 
+
     @PreAuthorize("hasPermission(this.wfmemberMapping.toDomain(#wfmemberdto),'ibzwf-WFMember-Create')")
     @ApiOperation(value = "根据角色/用户组建立成员", tags = {"成员" },  notes = "根据角色/用户组建立成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers")
@@ -244,7 +243,6 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto)));
     }
 
-    @PreAuthorize("hasPermission(this.wfmemberMapping.toDomain(#wfmemberdto),'ibzwf-WFMember-Save')")
     @ApiOperation(value = "根据角色/用户组保存成员", tags = {"成员" },  notes = "根据角色/用户组保存成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/save")
     public ResponseEntity<Boolean> saveByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberDTO wfmemberdto) {
@@ -253,7 +251,6 @@ public class WFMemberResource {
         return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.save(domain));
     }
 
-    @PreAuthorize("hasPermission(this.wfmemberMapping.toDomain(#wfmemberdtos),'ibzwf-WFMember-Save')")
     @ApiOperation(value = "根据角色/用户组批量保存成员", tags = {"成员" },  notes = "根据角色/用户组批量保存成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/savebatch")
     public ResponseEntity<Boolean> saveBatchByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {
@@ -373,7 +370,6 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto)));
     }
 
-    @PreAuthorize("hasPermission(this.wfmemberMapping.toDomain(#wfmemberdto),'ibzwf-WFMember-Save')")
     @ApiOperation(value = "根据用户保存成员", tags = {"成员" },  notes = "根据用户保存成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/save")
     public ResponseEntity<Boolean> saveByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberDTO wfmemberdto) {
@@ -382,7 +378,6 @@ public class WFMemberResource {
         return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.save(domain));
     }
 
-    @PreAuthorize("hasPermission(this.wfmemberMapping.toDomain(#wfmemberdtos),'ibzwf-WFMember-Save')")
     @ApiOperation(value = "根据用户批量保存成员", tags = {"成员" },  notes = "根据用户批量保存成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/savebatch")
     public ResponseEntity<Boolean> saveBatchByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFProcessDefinitionResource.java

@@ -159,5 +159,6 @@ public class WFProcessDefinitionResource {
 	}
 
 
+
 }
 

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFREModelResource.java

@@ -148,5 +148,6 @@ public class WFREModelResource {
 	}
 
 
+
 }
 

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFSystemResource.java

@@ -159,5 +159,6 @@ public class WFSystemResource {
 	}
 
 
+
 }
 

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFTaskResource.java

@@ -148,5 +148,6 @@ public class WFTaskResource {
 	}
 
 
+
 }
 

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFUserResource.java

@@ -159,5 +159,6 @@ public class WFUserResource {
 	}
 
 
+
 }
 

ibzwf-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java

@@ -293,7 +293,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
 
         Map<String,String> permissionFiled=new HashMap<>();
         String orgField="orgid";  //组织属性
-        String orgDeptField="orgsecid"; //部门属性
+        String orgDeptField="orgsectorid"; //部门属性
         String createManField="createman"; //创建人属性
 
         DEFieldCacheMap.getFieldMap(entityBase.getClass().getName());