ibizdev提交

app_web/src/engine/view/wfdyna-exp-grid-view-engine.ts

+import GridViewEngine from './grid-view-engine';
+
+/**
+ * 视图引擎基础
+ *
+ * @export
+ * @class WFDynaExpGridViewEngine
+ * @extends {GridViewEngine}
+ */
+export default class WFDynaExpGridViewEngine extends GridViewEngine {
+
+    /**
+     * Creates an instance of WFDynaExpGridViewEngine.
+     * @memberof WFDynaExpGridViewEngine
+     */
+    constructor() {
+        super();
+    }
+    
+    /**
+     * 引擎加载
+     *
+     * @param {*} [opts={}]
+     * @memberof WFDynaExpGridViewEngine
+     */
+    public load(opts: any = {},isnotify:boolean=false): void {
+        this.view.getWFStepModel().then((res:any) =>{
+            if(!this.view.isformDruipart){
+                super.load(opts);
+            }else{
+                if(isnotify){
+                    super.load(opts);
+                }
+            }
+        })
+    }
+}
\ No newline at end of file

app_web/src/mock/entity/ibzdepartments/ibzdepartments.ts

@@ -6,10 +6,55 @@ const mock = MockAdapter.getInstance();
 const mockDatas: Array<any> = [
 ];
 
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzou-app-web\/ibzdepartments\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzdepartment 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzou-app-web\/ibzdepartments\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzdepartment 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
 // createBatch
 mock.onPost(new RegExp(/^\/ibzdepartments\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibzdepartment 方法: createBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -21,6 +66,7 @@ mock.onPost(new RegExp(/^\/ibzdepartments\/batch$/)).reply((config: any) => {
 mock.onPut(new RegExp(/^\/ibzdepartments\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibzdepartment 方法: updateBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -32,6 +78,7 @@ mock.onPut(new RegExp(/^\/ibzdepartments\/batch$/)).reply((config: any) => {
 mock.onDelete(new RegExp(/^\/ibzdepartments\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibzdepartment 方法: removeBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];

app_web/src/mock/entity/ibzemployees/ibzemployees.ts

@@ -6,10 +6,55 @@ const mock = MockAdapter.getInstance();
 const mockDatas: Array<any> = [
 ];
 
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzou-app-web\/ibzemployees\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzemployee 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzou-app-web\/ibzemployees\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzemployee 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
 // createBatch
 mock.onPost(new RegExp(/^\/ibzemployees\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibzemployee 方法: createBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -21,6 +66,7 @@ mock.onPost(new RegExp(/^\/ibzemployees\/batch$/)).reply((config: any) => {
 mock.onPut(new RegExp(/^\/ibzemployees\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibzemployee 方法: updateBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -32,6 +78,7 @@ mock.onPut(new RegExp(/^\/ibzemployees\/batch$/)).reply((config: any) => {
 mock.onDelete(new RegExp(/^\/ibzemployees\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibzemployee 方法: removeBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];

app_web/src/mock/entity/ibzorganizations/ibzorganizations.ts

@@ -6,10 +6,55 @@ const mock = MockAdapter.getInstance();
 const mockDatas: Array<any> = [
 ];
 
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzou-app-web\/ibzorganizations\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzorganization 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzou-app-web\/ibzorganizations\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzorganization 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
 // createBatch
 mock.onPost(new RegExp(/^\/ibzorganizations\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibzorganization 方法: createBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -21,6 +66,7 @@ mock.onPost(new RegExp(/^\/ibzorganizations\/batch$/)).reply((config: any) => {
 mock.onPut(new RegExp(/^\/ibzorganizations\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibzorganization 方法: updateBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -32,6 +78,7 @@ mock.onPut(new RegExp(/^\/ibzorganizations\/batch$/)).reply((config: any) => {
 mock.onDelete(new RegExp(/^\/ibzorganizations\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibzorganization 方法: removeBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];

config.xml

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

ibzou-app/ibzou-app-web/src/main/java/cn/ibizlab/web/config/webSecurityConfig.java

@@ -41,6 +41,15 @@ public class webSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.file.uploadpath:ibizutil/upload}")
+    private String uploadpath;
+
+    @Value("${ibiz.file.downloadpath:ibizutil/download}")
+    private String downloadpath;
+
+    @Value("${ibiz.file.previewpath:ibizutil/preview}")
+    private String previewpath;
+
     @Autowired
     public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
         auth
@@ -97,6 +106,10 @@ public class webSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                // 文件操作
+                .antMatchers("/"+downloadpath+"/**").permitAll()
+                .antMatchers("/"+uploadpath).permitAll()
+                .antMatchers("/"+previewpath+"/**").permitAll()
                 // 所有请求都需要认证
                 .anyRequest().authenticated()
                 // 防止iframe 造成跨域

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

 server:
-  port: 40001
+  port: 8080
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java

@@ -35,7 +35,7 @@ public class IBZOrganization extends EntityMP implements Serializable {
     /**
      * 单位标识
      */
-    @DEField(isKeyField=true)
+    @DEField(defaultValue = "orgcode" , defaultValueType = DEFieldDefaultValueType.PARAM , isKeyField=true)
     @TableId(value= "orgid",type=IdType.UUID)
     @JSONField(name = "orgid")
     @JsonProperty("orgid")

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

@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
 
     <!--输出实体[IBZORG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzorg-409-1">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzorg-410-1">
         <createTable tableName="IBZORG">
                 <column name="ORGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZORG_ORGID"/>
@@ -137,7 +137,7 @@
     </changeSet>
 
         <!--输出实体[IBZORG]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzorg-409-4">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzorg-410-4">
        <addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_IBZORG_IBZORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[IBZEMP]外键关系 -->

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

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

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

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDepartmentResource.java

@@ -55,7 +55,7 @@ public class IBZDepartmentResource {
 
 
 
-    @PreAuthorize("hasPermission('','Create',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Create", tags = {"IBZDepartment" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments")
     @Transactional
@@ -66,7 +66,7 @@ public class IBZDepartmentResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','Create',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "createBatch", tags = {"createBatch" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/createbatch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) {
@@ -77,7 +77,7 @@ public class IBZDepartmentResource {
 
 
 
-    @PreAuthorize("hasPermission(#ibzdepartment_id,'Get',this.getEntity())")
+    @PreAuthorize("hasPermission(#ibzdepartment_id,'Get',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Get", tags = {"IBZDepartment" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}")
     public ResponseEntity<IBZDepartmentDTO> get(@PathVariable("ibzdepartment_id") String ibzdepartment_id) {
@@ -123,7 +123,7 @@ public class IBZDepartmentResource {
 
 
 
-    @PreAuthorize("hasPermission('Remove',{#ibzdepartment_id,this.getEntity()})")
+    @PreAuthorize("hasPermission('Remove',{#ibzdepartment_id,{this.getEntity(),'Sql'}})")
     @ApiOperation(value = "Remove", tags = {"IBZDepartment" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}")
     @Transactional
@@ -141,7 +141,7 @@ public class IBZDepartmentResource {
 
 
 
-    @PreAuthorize("hasPermission(#ibzdepartment_id,'Update',this.getEntity())")
+    @PreAuthorize("hasPermission(#ibzdepartment_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Update", tags = {"IBZDepartment" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}")
     @Transactional
@@ -153,7 +153,7 @@ public class IBZDepartmentResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#ibzdepartment_id,'Update',this.getEntity())")
+    @PreAuthorize("hasPermission(#ibzdepartment_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/updatebatch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) {
@@ -161,7 +161,7 @@ public class IBZDepartmentResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"IBZDepartment" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/fetchdefault")
 	public ResponseEntity<List<IBZDepartmentDTO>> fetchDefault(IBZDepartmentSearchContext context) {
@@ -174,7 +174,7 @@ public class IBZDepartmentResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"IBZDepartment" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/searchdefault")
 	public ResponseEntity<Page<IBZDepartmentDTO>> searchDefault(IBZDepartmentSearchContext context) {

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZEmployeeResource.java

@@ -55,7 +55,7 @@ public class IBZEmployeeResource {
 
 
 
-    @PreAuthorize("hasPermission('Remove',{#ibzemployee_id,this.getEntity()})")
+    @PreAuthorize("hasPermission('Remove',{#ibzemployee_id,{this.getEntity(),'Sql'}})")
     @ApiOperation(value = "Remove", tags = {"IBZEmployee" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/{ibzemployee_id}")
     @Transactional
@@ -86,7 +86,7 @@ public class IBZEmployeeResource {
 
 
 
-    @PreAuthorize("hasPermission('','Create',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Create", tags = {"IBZEmployee" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees")
     @Transactional
@@ -97,7 +97,7 @@ public class IBZEmployeeResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','Create',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "createBatch", tags = {"createBatch" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/createbatch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
@@ -117,7 +117,7 @@ public class IBZEmployeeResource {
 
 
 
-    @PreAuthorize("hasPermission(#ibzemployee_id,'Update',this.getEntity())")
+    @PreAuthorize("hasPermission(#ibzemployee_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Update", tags = {"IBZEmployee" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/{ibzemployee_id}")
     @Transactional
@@ -129,7 +129,7 @@ public class IBZEmployeeResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#ibzemployee_id,'Update',this.getEntity())")
+    @PreAuthorize("hasPermission(#ibzemployee_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/updatebatch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
@@ -156,7 +156,7 @@ public class IBZEmployeeResource {
 
 
 
-    @PreAuthorize("hasPermission(#ibzemployee_id,'Get',this.getEntity())")
+    @PreAuthorize("hasPermission(#ibzemployee_id,'Get',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Get", tags = {"IBZEmployee" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/{ibzemployee_id}")
     public ResponseEntity<IBZEmployeeDTO> get(@PathVariable("ibzemployee_id") String ibzemployee_id) {
@@ -174,7 +174,7 @@ public class IBZEmployeeResource {
         return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeMapping.toDto(ibzemployeeService.getDraft(new IBZEmployee())));
     }
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"IBZEmployee" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzemployees/fetchdefault")
 	public ResponseEntity<List<IBZEmployeeDTO>> fetchDefault(IBZEmployeeSearchContext context) {
@@ -187,7 +187,7 @@ public class IBZEmployeeResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"IBZEmployee" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzemployees/searchdefault")
 	public ResponseEntity<Page<IBZEmployeeDTO>> searchDefault(IBZEmployeeSearchContext context) {

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZOrganizationResource.java

@@ -64,7 +64,7 @@ public class IBZOrganizationResource {
 
 
 
-    @PreAuthorize("hasPermission(#ibzorganization_id,'Update',this.getEntity())")
+    @PreAuthorize("hasPermission(#ibzorganization_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Update", tags = {"IBZOrganization" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}")
     @Transactional
@@ -76,7 +76,7 @@ public class IBZOrganizationResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#ibzorganization_id,'Update',this.getEntity())")
+    @PreAuthorize("hasPermission(#ibzorganization_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/updatebatch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
@@ -87,7 +87,7 @@ public class IBZOrganizationResource {
 
 
 
-    @PreAuthorize("hasPermission('','Create',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Create", tags = {"IBZOrganization" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations")
     @Transactional
@@ -98,7 +98,7 @@ public class IBZOrganizationResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','Create',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "createBatch", tags = {"createBatch" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/createbatch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
@@ -125,7 +125,7 @@ public class IBZOrganizationResource {
 
 
 
-    @PreAuthorize("hasPermission('Remove',{#ibzorganization_id,this.getEntity()})")
+    @PreAuthorize("hasPermission('Remove',{#ibzorganization_id,{this.getEntity(),'Sql'}})")
     @ApiOperation(value = "Remove", tags = {"IBZOrganization" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}")
     @Transactional
@@ -143,7 +143,7 @@ public class IBZOrganizationResource {
 
 
 
-    @PreAuthorize("hasPermission(#ibzorganization_id,'Get',this.getEntity())")
+    @PreAuthorize("hasPermission(#ibzorganization_id,'Get',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Get", tags = {"IBZOrganization" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}")
     public ResponseEntity<IBZOrganizationDTO> get(@PathVariable("ibzorganization_id") String ibzorganization_id) {
@@ -161,7 +161,7 @@ public class IBZOrganizationResource {
         return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationMapping.toDto(ibzorganizationService.getDraft(new IBZOrganization())));
     }
 
-    @PreAuthorize("hasPermission('Get',{#context,'SelectSOrg',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'SelectSOrg',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetch查询下级单位", tags = {"IBZOrganization" } ,notes = "fetch查询下级单位")
     @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchselectsorg")
 	public ResponseEntity<List<IBZOrganizationDTO>> fetchSelectSOrg(IBZOrganizationSearchContext context) {
@@ -174,7 +174,7 @@ public class IBZOrganizationResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'SelectSOrg',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'SelectSOrg',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "search查询下级单位", tags = {"IBZOrganization" } ,notes = "search查询下级单位")
     @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/searchselectsorg")
 	public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectSOrg(IBZOrganizationSearchContext context) {
@@ -183,7 +183,7 @@ public class IBZOrganizationResource {
                 .body(new PageImpl(ibzorganizationMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'SelectPOrg',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'SelectPOrg',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetch查询上级单位", tags = {"IBZOrganization" } ,notes = "fetch查询上级单位")
     @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchselectporg")
 	public ResponseEntity<List<IBZOrganizationDTO>> fetchSelectPOrg(IBZOrganizationSearchContext context) {
@@ -196,7 +196,7 @@ public class IBZOrganizationResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'SelectPOrg',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'SelectPOrg',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "search查询上级单位", tags = {"IBZOrganization" } ,notes = "search查询上级单位")
     @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/searchselectporg")
 	public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectPOrg(IBZOrganizationSearchContext context) {
@@ -205,7 +205,7 @@ public class IBZOrganizationResource {
                 .body(new PageImpl(ibzorganizationMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"IBZOrganization" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchdefault")
 	public ResponseEntity<List<IBZOrganizationDTO>> fetchDefault(IBZOrganizationSearchContext context) {
@@ -218,7 +218,7 @@ public class IBZOrganizationResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"IBZOrganization" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/searchdefault")
 	public ResponseEntity<Page<IBZOrganizationDTO>> searchDefault(IBZOrganizationSearchContext context) {

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

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

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

 server:
-  port: 40001
+  port: 8081

ibzou-util/src/main/java/cn/ibizlab/util/domain/FileItem.java

@@ -14,6 +14,8 @@ public class FileItem
 {
 	private String id;
 	private String name;
+	private String fileid;
+	private String filename;
 	private long size;
 	private String ext;
 }

ibzou-util/src/main/java/cn/ibizlab/util/rest/FileController.java

@@ -14,21 +14,20 @@ import java.io.*;
 
 
 @Slf4j
+@RestController
+@RequestMapping("/")
 public class FileController
 {
 
 	@Autowired
 	private FileService fileService;
 
-	@PostMapping(value = "${ibiz.uploadpath.path:ibizutil/upload}")
+	@PostMapping(value = "${ibiz.file.uploadpath:ibizutil/upload}")
 	public ResponseEntity<FileItem> upload(@RequestParam("file") MultipartFile multipartFile){
 		return ResponseEntity.ok().body(fileService.saveFile(multipartFile));
 	}
 
 	private final String defaultdownloadpath="ibizutil/download/{id}";
-	protected String getDefaultdownloadpath(){
-		return defaultdownloadpath;
-	}
 
 	@GetMapping(value = "${ibiz.file.downloadpath:"+defaultdownloadpath+"}")
 	@ResponseStatus(HttpStatus.OK)

ibzou-util/src/main/java/cn/ibizlab/util/service/SimpleFileService.java

@@ -3,6 +3,7 @@ package cn.ibizlab.util.service;
 import cn.ibizlab.util.domain.FileItem;
 import cn.ibizlab.util.errors.InternalServerErrorException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
@@ -11,7 +12,6 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.UUID;
 
 @Primary
 @Slf4j
@@ -21,26 +21,22 @@ public class SimpleFileService implements FileService {
     @Value("${ibiz.filePath:/app/file/}")
     private String fileRoot;
 
-
     @Override
     public FileItem saveFile(MultipartFile multipartFile) {
-
         FileItem item=null;
         // 获取文件名
         String fileName = multipartFile.getOriginalFilename();
         // 获取文件后缀
         String extname="."+getExtensionName(fileName);
-        // 用uuid作为文件名，防止生成的临时文件重复
-        String fileid= UUID.randomUUID().toString();
-        String fileFullPath = this.fileRoot+"ibztuit"+File.separator+fileid+File.separator+fileName;
-
-        File file = new File(fileFullPath);
-        File parent = new File(file.getParent());
-        if(!parent.exists())
-            parent.mkdirs();
         try {
-            FileCopyUtils.copy(multipartFile.getInputStream() , Files.newOutputStream(file.toPath()));
-            item=new FileItem(fileid,fileName, (int)multipartFile.getSize() ,extname);
+            String fileid= DigestUtils.md5Hex(multipartFile.getInputStream());
+            String fileFullPath = this.fileRoot+"ibizutil"+File.separator+fileid+File.separator+fileName;
+            File file = new File(fileFullPath);
+            File parent = new File(file.getParent());
+            if(!parent.exists())
+                parent.mkdirs();
+            FileCopyUtils.copy(multipartFile.getInputStream(),Files.newOutputStream(file.toPath()));
+            item=new FileItem(fileid,fileName,fileid,fileName,(int)multipartFile.getSize(),extname);
         } catch (IOException e) {
             throw new InternalServerErrorException("文件上传失败");
         }
@@ -49,7 +45,7 @@ public class SimpleFileService implements FileService {
 
     @Override
     public File getFile(String fileid) {
-        String dirpath = this.fileRoot+"ibztuit"+File.separator+fileid;
+        String dirpath = this.fileRoot+"ibizutil"+File.separator+fileid;
         File parent = new File(dirpath);
         if (parent.exists() && parent.isDirectory() && parent.listFiles().length > 0) {
             return parent.listFiles()[0];