ibiz4j 发布系统代码

app_web/src/styles/default.less

@@ -64,14 +64,14 @@
 
 // tab分页模式首页布局
 .index_tab_content{
-    .view-container {
+    >.view-container {
         height: calc(100% - 65px);
         margin: 0px 12px;
     }
 }
 // 面包屑模式首页布局
 .index_route_content{
-    .view-container {
+    >.view-container {
         height: calc(100% - 36px);
         margin: 12px;
     }

ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/rest/DictCatalogResource.java

@@ -137,7 +137,7 @@ public class DictCatalogResource {
         return  ResponseEntity.status(HttpStatus.OK).body(dictcatalogService.checkKey(dictcatalogMapping.toDomain(dictcatalogdto)));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-searchDefault-all')")
 	@ApiOperation(value = "获取DEFAULT", tags = {"字典" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/dictcatalogs/fetchdefault")
 	public ResponseEntity<List<DictCatalogDTO>> fetchDefault(DictCatalogSearchContext context) {
@@ -150,7 +150,7 @@ public class DictCatalogResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-searchDefault-all')")
 	@ApiOperation(value = "查询DEFAULT", tags = {"字典" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/dictcatalogs/searchdefault")
 	public ResponseEntity<Page<DictCatalogDTO>> searchDefault(@RequestBody DictCatalogSearchContext context) {

ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/rest/DictOptionResource.java

@@ -137,7 +137,7 @@ public class DictOptionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-searchDefault-all')")
 	@ApiOperation(value = "获取DEFAULT", tags = {"字典项" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/dictoptions/fetchdefault")
 	public ResponseEntity<List<DictOptionDTO>> fetchDefault(DictOptionSearchContext context) {
@@ -150,7 +150,7 @@ public class DictOptionResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-searchDefault-all')")
 	@ApiOperation(value = "查询DEFAULT", tags = {"字典项" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/dictoptions/searchdefault")
 	public ResponseEntity<Page<DictOptionDTO>> searchDefault(@RequestBody DictOptionSearchContext context) {
@@ -267,7 +267,7 @@ public class DictOptionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-searchDefault-all')")
 	@ApiOperation(value = "根据字典获取DEFAULT", tags = {"字典项" } ,notes = "根据字典获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/dictcatalogs/{dictcatalog_id}/dictoptions/fetchdefault")
 	public ResponseEntity<List<DictOptionDTO>> fetchDictOptionDefaultByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id,DictOptionSearchContext context) {
@@ -281,7 +281,7 @@ public class DictOptionResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-searchDefault-all')")
 	@ApiOperation(value = "根据字典查询DEFAULT", tags = {"字典项" } ,notes = "根据字典查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/dictcatalogs/{dictcatalog_id}/dictoptions/searchdefault")
 	public ResponseEntity<Page<DictOptionDTO>> searchDictOptionDefaultByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @RequestBody DictOptionSearchContext context) {

ibzdict-util/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java

 package cn.ibizlab.util.client;
 
 import org.springframework.stereotype.Component;
-import java.util.List;
+import java.util.*;
 
 @Component
 public class IBZWFFallback implements IBZWFFeignClient {
@@ -15,4 +15,9 @@ public class IBZWFFallback implements IBZWFFeignClient {
     public List<String> getbusinesskeysByUserId(String system, String userId, String entity, String processDefinitionKey, String taskDefinitionKey) {
         return null;
     }
+
+    @Override
+    public Boolean deployBpmnFile(List<Map<String, Object>> bpmnfiles) {
+        return null;
+    }
 }

ibzdict-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java

@@ -2,7 +2,7 @@ package cn.ibizlab.util.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
-import java.util.List;
+import java.util.*;
 
 @FeignClient(value = "ibzwf-api",fallback = IBZWFFallback.class)
 public interface IBZWFFeignClient
@@ -15,4 +15,7 @@ public interface IBZWFFeignClient
 	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{entity}/process-definitions/{processDefinitionKey}/usertasks/{taskDefinitionKey}/tasks")
 	List<String> getbusinesskeysByUserId(@PathVariable("system") String system,@PathVariable("userId") String userId,
 																@PathVariable("entity") String entity,@PathVariable("processDefinitionKey") String processDefinitionKey,@PathVariable("taskDefinitionKey") String taskDefinitionKey);
+
+	@RequestMapping(method = RequestMethod.POST, value = "/deploybpmn")
+	Boolean deployBpmnFile(@RequestBody List<Map<String,Object>> bpmnfiles);
 }

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

@@ -11,7 +11,9 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
+import org.springframework.util.DigestUtils;
 import java.io.InputStream;
+import java.util.*;
 
 /**
  * 权限：向uaa同步当前系统菜单、权限资源任务类
@@ -21,15 +23,14 @@ import java.io.InputStream;
 @ConditionalOnProperty( name = "ibiz.enablePermissionValid", havingValue = "true")
 public class PermissionSyncJob implements ApplicationRunner {
 
-
     @Autowired
     @Lazy
     private IBZUAAFeignClient client;
 
-
     @Value("${ibiz.systemid:ibzdict}")
     private String systemId;
 
+
     @Override
     public void run(ApplicationArguments args) {
         try {
@@ -40,6 +41,7 @@ public class PermissionSyncJob implements ApplicationRunner {
             system.put("pssystemid",systemId);
             system.put("pssystemname",systemId);
             system.put("sysstructure",JSONObject.parseObject(permissionResult));
+            system.put("md5check",DigestUtils.md5DigestAsHex(permissionResult.getBytes()));
             if(client.syncSysAuthority(system)){
                 log.info("向[UAA]同步系统资源成功");
             }else{
@@ -49,5 +51,6 @@ public class PermissionSyncJob implements ApplicationRunner {
         catch (Exception ex) {
             log.error(String.format("向[UAA]同步系统资源失败，请检查[UAA]服务是否正常! [%s]",ex));
         }
+
     }
 }
\ No newline at end of file