ibizdev提交

app_web/src/service/entity-service.ts

@@ -33,47 +33,65 @@ export default class EntityService {
     /**
      * 零时储存,localStorage指向
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof EntityService
      */ 
-    protected tempStorage:any;
+    public tempStorage:any;
 
     /**
      * 当前DE标识
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof EntityService
      */ 
-    protected APPDEKEY:string= '';
+    public APPDEKEY:string= '';
 
     /**
      * 当前APPDE标识
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof EntityService
      */ 
-    protected APPLYDEKEY:string= '';
+    public APPLYDEKEY:string= '';
 
     /**
      * 当前NAME
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof EntityService
      */ 
-    protected APPDENAME:string= '';
+    public APPDENAME:string= '';
 
     /**
      * 当前主信息名
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof EntityService
      */ 
-    protected APPDETEXT:string= '';
+    public APPDETEXT:string= '';
+
+    /**
+     * 当前系统名
+     * 
+     * @public
+     * @type {(string)}
+     * @memberof EntityService
+     */ 
+    public SYSTEMNAME:string= '';
+
+    /**
+     * 当前应用名
+     * 
+     * @public
+     * @type {(string)}
+     * @memberof EntityService
+     */ 
+    public APPNAME:string= '';
 
     /**
      * Creates an instance of EntityService.
@@ -610,13 +628,18 @@ export default class EntityService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {boolean} [isEmbeddedApp]
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async WFStart(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        const requestData:any = {};
-        Object.assign(requestData,{wfdata:data});
-        return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfstart`,requestData,isloading);
+    public async WFStart(context: any = {},data: any = {}, isloading?: boolean,isEmbeddedApp?:boolean): Promise<any> {
+        if(isEmbeddedApp){
+            return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/process-instances`,data,isloading);
+        }else{
+            const requestData:any = {};
+            Object.assign(requestData,{wfdata:data});
+            return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfstart`,requestData,isloading);
+        }
     }
 
 
@@ -699,27 +722,72 @@ export default class EntityService {
         return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfreassign`,data,isloading);
     }
 
+
+    /**
+     * WFGetWorkFlow接口方法(获取工作流定义)
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */
+    public async WFGetWorkFlow(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/process-definitions`);
+    }
+
+    /**
+     * WFGetWFStep接口方法(根据系统实体查找当前适配的工作流模型步骤)
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */
+    public async WFGetWFStep(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/process-definitions-nodes`);
+    }
+
+    /**
+     * GetWFLink接口方法(根据业务主键和当前步骤获取操作路径)
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */
+    public async GetWFLink(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/usertasks/${data['taskDefinitionKey']}/ways`);
+    }
+
     /**
      * WFSubmit接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {boolean} [isEmbeddedApp]
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async WFSubmit(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        const requestData:any = {};
-        if(data.srfwfmemo){
-            requestData.srfwfmemo = JSON.parse(JSON.stringify(data)).srfwfmemo;
-            delete data.srfwfmemo;
-        }
-        if(data.viewparams){
-            delete data.viewparams;
+    public async WFSubmit(context: any = {},data: any = {}, isloading?: boolean,isEmbeddedApp?:boolean): Promise<any> {
+        if(isEmbeddedApp){
+            return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/tasks/${data['taskId']}`);
+        }else{
+            const requestData:any = {};
+            if(data.srfwfmemo){
+                requestData.srfwfmemo = JSON.parse(JSON.stringify(data)).srfwfmemo;
+                delete data.srfwfmemo;
+            }
+            if(data.viewparams){
+                delete data.viewparams;
+            }
+            Object.assign(requestData,{wfdata:data});
+            Object.assign(requestData,{opdata:{srfwfiatag:context.srfwfiatag,srfwfstep:context.srfwfstep}});
+            return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfsubmit`,requestData,isloading);
         }
-        Object.assign(requestData,{wfdata:data});
-        Object.assign(requestData,{opdata:{srfwfiatag:context.srfwfiatag,srfwfstep:context.srfwfstep}});
-        return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfsubmit`,requestData,isloading);
     }
 
     /**

app_web/src/service/wfgroup/wfgroup-service-base.ts

@@ -32,6 +32,8 @@ export default class WFGroupServiceBase extends EntityService {
         this.APPDEKEY = 'id';
         this.APPDENAME = 'wfgroups';
         this.APPDETEXT = 'name';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzwf';
     }
 
 // 实体接口

app_web/src/service/wfmember/wfmember-service-base.ts

@@ -32,6 +32,8 @@ export default class WFMemberServiceBase extends EntityService {
         this.APPDEKEY = 'memberid';
         this.APPDENAME = 'wfmembers';
         this.APPDETEXT = 'membername';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzwf';
     }
 
 // 实体接口

app_web/src/service/wfprocess-definition/wfprocess-definition-service-base.ts

@@ -32,6 +32,8 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
         this.APPDEKEY = 'definitionkey';
         this.APPDENAME = 'wfprocessdefinitions';
         this.APPDETEXT = 'definitionname';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzwf';
     }
 
 // 实体接口

app_web/src/service/wfsystem/wfsystem-service-base.ts

@@ -32,6 +32,8 @@ export default class WFSystemServiceBase extends EntityService {
         this.APPDEKEY = 'pssystemid';
         this.APPDENAME = 'wfsystems';
         this.APPDETEXT = 'pssystemname';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzwf';
     }
 
 // 实体接口

app_web/src/service/wfuser/wfuser-service-base.ts

@@ -32,6 +32,8 @@ export default class WFUserServiceBase extends EntityService {
         this.APPDEKEY = 'id';
         this.APPDENAME = 'wfusers';
         this.APPDETEXT = 'displayname';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzwf';
     }
 
 // 实体接口

config.xml

@@ -38,11 +38,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 dev --with-registry-auth      
+      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 dev --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

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

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

@@ -3,7 +3,7 @@ services:
   ibzwf-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
     ports:
-      - "8080:8080"
+      - "30003:30003"
     networks:
       - agent_network
     deploy:

ibzwf-app/ibzwf-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 30003
\ No newline at end of file

ibzwf-app/ibzwf-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 30003
 
 #zuul网关路由设置
 zuul:

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

 server:
-  port: 40003
+  port: 8080
 

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

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

@@ -3,7 +3,7 @@ services:
   ibzwf-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
     ports:
-      - "40003:40003"
+      - "8081:8081"
     networks:
       - agent_network
     deploy:

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

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

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

 server:
-  port: 40003
+  port: 8081

ibzwf-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
+    @Value("${ibiz.systemid:0A91C1B1-3B67-4EDA-9572-5DB491871FEE}")
     private String systemId;
 
     @Override

ibzwf-util/src/main/java/cn/ibizlab/util/service/SimpleUserService.java

@@ -22,7 +22,7 @@ public class SimpleUserService implements AuthenticationUserService{
 	@Value("${ibiz.enablePermissionValid:false}")
 	boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
+    @Value("${ibiz.systemid:0A91C1B1-3B67-4EDA-9572-5DB491871FEE}")
     private String systemid;
 
 	@Autowired