diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..651b7ba --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +HELP.md +.gradle +.idea +build/ +**/.gradle +**/.idea +**/build + + +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin index 91b25b0..3502ce3 100644 Binary files a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin and b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin differ diff --git a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock index d48ae2b..35bd4ad 100644 Binary files a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock and b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin index a3b017b..6c7f925 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin and b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock index b63e1f1..27affbb 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock and b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin b/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin index 52f2878..2f4b6ee 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin and b/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin differ diff --git a/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 439223c..021ba3d 100644 Binary files a/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/main_vm/.gradle/file-system.probe b/main_vm/.gradle/file-system.probe index b3dc01e..3b966cb 100644 Binary files a/main_vm/.gradle/file-system.probe and b/main_vm/.gradle/file-system.probe differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/test/controller/TestRestController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/test/controller/TestRestController.class index 1dfadd6..dab1b09 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/test/controller/TestRestController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/test/controller/TestRestController.class differ diff --git a/main_vm/build/tmp/compileJava/previous-compilation-data.bin b/main_vm/build/tmp/compileJava/previous-compilation-data.bin index 2b41433..25e88a9 100644 Binary files a/main_vm/build/tmp/compileJava/previous-compilation-data.bin and b/main_vm/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/test/controller/TestRestController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/test/controller/TestRestController.java index ae11f5d..a467642 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/test/controller/TestRestController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/test/controller/TestRestController.java @@ -18,6 +18,7 @@ import com.icomsys.main_vm.biz.common.system.vo.SystemServiceGroupViewVo; import com.icomsys.main_vm.biz.test.controller.testvo.APINodeVo; import com.icomsys.main_vm.common.code.EnumToMap; import com.icomsys.main_vm.common.code.enumresource.MenuResource; +import com.icomsys.main_vm.common.code.enumresource.PolicyResource; import com.icomsys.main_vm.db.jpa.entity.conversation.TbProjectSetting; import com.icomsys.main_vm.db.jpa.entity.system.TbIcsCustInfo; import com.icomsys.main_vm.db.jpa.repo.scenario.TbApiNodeRepo; @@ -36,6 +37,7 @@ import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; @RequestMapping("/rest") @RestController @@ -78,7 +80,7 @@ public class TestRestController { @GetMapping("/test5") public Object test5() { log.info("test5 init"); - return testRestService.authToMenuList(testRestService.initData(), 1000001); + return testRestService.authToMenuList(PolicyResource.ALL.stream().map(e -> e.getName().toString()).collect(Collectors.toList()), 1000001); } @@ -91,7 +93,7 @@ public class TestRestController { @GetMapping("/test6") public Object test6() { log.info("test6 init"); - return testRestService.authToAuthList(testRestService.initData(), 1000001); + return testRestService.authToAuthList(PolicyResource.ALL.stream().map(e -> e.getName().toString()).collect(Collectors.toList()), 1000001); } @GetMapping("/test7") diff --git a/main_vm/src/main/resources/templates/layout/fragments/sidebar.html b/main_vm/src/main/resources/templates/layout/fragments/sidebar.html index e857ae6..da1de94 100644 --- a/main_vm/src/main/resources/templates/layout/fragments/sidebar.html +++ b/main_vm/src/main/resources/templates/layout/fragments/sidebar.html @@ -5,6 +5,46 @@